2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/smp.h>
|
|
|
|
#include <linux/timex.h>
|
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/seq_file.h>
|
2005-12-03 02:43:20 +08:00
|
|
|
#include <linux/cpufreq.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Get CPU information for use by the procfs.
|
|
|
|
*/
|
2008-02-21 02:45:29 +08:00
|
|
|
static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
|
|
|
|
unsigned int cpu)
|
|
|
|
{
|
2009-02-28 21:20:21 +08:00
|
|
|
#ifdef CONFIG_SMP
|
2008-02-21 02:45:29 +08:00
|
|
|
if (c->x86_max_cores * smp_num_siblings > 1) {
|
|
|
|
seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
|
|
|
|
seq_printf(m, "siblings\t: %d\n",
|
x86: show number of core_siblings instead of thread_siblings in /proc/cpuinfo
Commit 7ad728f98162cb1af06a85b2a5fc422dddd4fb78
(cpumask: x86: convert cpu_sibling_map/cpu_core_map to cpumask_var_t)
changed the output of /proc/cpuinfo for siblings:
Example on an AMD Phenom:
physical id : 0
siblings : 1
core id : 3
cpu cores : 4
Before that commit it was:
physical id : 0
siblings : 4
core id : 3
cpu cores : 4
Instead of cpu_core_mask it now uses cpu_sibling_mask to count siblings.
This is due to the following hunk of above commit:
| --- a/arch/x86/kernel/cpu/proc.c
| +++ b/arch/x86/kernel/cpu/proc.c
| @@ -14,7 +14,7 @@ static void show_cpuinfo_core(struct seq_file *m, struct cpuinf
| if (c->x86_max_cores * smp_num_siblings > 1) {
| seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
| seq_printf(m, "siblings\t: %d\n",
| - cpus_weight(per_cpu(cpu_core_map, cpu)));
| + cpumask_weight(cpu_sibling_mask(cpu)));
| seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
| seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
| seq_printf(m, "apicid\t\t: %d\n", c->apicid);
This was a mistake, because the impact line shows that this side-effect
was not anticipated:
Impact: reduce per-cpu size for CONFIG_CPUMASK_OFFSTACK=y
So revert the respective hunk to restore the old behavior.
[ Impact: fix sibling-info regression in /proc/cpuinfo ]
Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
LKML-Reference: <20090504182859.GA29045@alberich.amd.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-05-05 02:28:59 +08:00
|
|
|
cpumask_weight(cpu_core_mask(cpu)));
|
2008-02-21 02:45:29 +08:00
|
|
|
seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
|
|
|
|
seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
|
2008-03-07 05:46:39 +08:00
|
|
|
seq_printf(m, "apicid\t\t: %d\n", c->apicid);
|
|
|
|
seq_printf(m, "initial apicid\t: %d\n", c->initial_apicid);
|
2008-02-21 02:45:29 +08:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2009-02-28 21:20:21 +08:00
|
|
|
#ifdef CONFIG_X86_32
|
2008-02-21 02:45:29 +08:00
|
|
|
static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* We use exception 16 if we have hardware math and we've either seen
|
|
|
|
* it or the CPU claims it is internal
|
|
|
|
*/
|
|
|
|
int fpu_exception = c->hard_math && (ignore_fpu_irq || cpu_has_fpu);
|
|
|
|
seq_printf(m,
|
|
|
|
"fdiv_bug\t: %s\n"
|
|
|
|
"hlt_bug\t\t: %s\n"
|
|
|
|
"f00f_bug\t: %s\n"
|
|
|
|
"coma_bug\t: %s\n"
|
|
|
|
"fpu\t\t: %s\n"
|
|
|
|
"fpu_exception\t: %s\n"
|
|
|
|
"cpuid level\t: %d\n"
|
|
|
|
"wp\t\t: %s\n",
|
|
|
|
c->fdiv_bug ? "yes" : "no",
|
|
|
|
c->hlt_works_ok ? "no" : "yes",
|
|
|
|
c->f00f_bug ? "yes" : "no",
|
|
|
|
c->coma_bug ? "yes" : "no",
|
|
|
|
c->hard_math ? "yes" : "no",
|
|
|
|
fpu_exception ? "yes" : "no",
|
|
|
|
c->cpuid_level,
|
|
|
|
c->wp_works_ok ? "yes" : "no");
|
|
|
|
}
|
2008-02-21 02:48:02 +08:00
|
|
|
#else
|
|
|
|
static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
|
|
|
|
{
|
|
|
|
seq_printf(m,
|
|
|
|
"fpu\t\t: yes\n"
|
|
|
|
"fpu_exception\t: yes\n"
|
|
|
|
"cpuid level\t: %d\n"
|
|
|
|
"wp\t\t: yes\n",
|
|
|
|
c->cpuid_level);
|
|
|
|
}
|
|
|
|
#endif
|
2008-02-21 02:45:29 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static int show_cpuinfo(struct seq_file *m, void *v)
|
|
|
|
{
|
|
|
|
struct cpuinfo_x86 *c = v;
|
2011-12-21 08:52:22 +08:00
|
|
|
unsigned int cpu;
|
2008-02-21 02:45:29 +08:00
|
|
|
int i;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-02-21 02:45:29 +08:00
|
|
|
cpu = c->cpu_index;
|
|
|
|
seq_printf(m, "processor\t: %u\n"
|
|
|
|
"vendor_id\t: %s\n"
|
|
|
|
"cpu family\t: %d\n"
|
|
|
|
"model\t\t: %u\n"
|
|
|
|
"model name\t: %s\n",
|
|
|
|
cpu,
|
|
|
|
c->x86_vendor_id[0] ? c->x86_vendor_id : "unknown",
|
|
|
|
c->x86,
|
|
|
|
c->x86_model,
|
|
|
|
c->x86_model_id[0] ? c->x86_model_id : "unknown");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
if (c->x86_mask || c->cpuid_level >= 0)
|
|
|
|
seq_printf(m, "stepping\t: %d\n", c->x86_mask);
|
|
|
|
else
|
|
|
|
seq_printf(m, "stepping\t: unknown\n");
|
2011-10-13 08:46:33 +08:00
|
|
|
if (c->microcode)
|
2011-10-17 22:45:10 +08:00
|
|
|
seq_printf(m, "microcode\t: 0x%x\n", c->microcode);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-02-21 02:45:29 +08:00
|
|
|
if (cpu_has(c, X86_FEATURE_TSC)) {
|
|
|
|
unsigned int freq = cpufreq_quick_get(cpu);
|
|
|
|
|
2005-12-03 02:43:20 +08:00
|
|
|
if (!freq)
|
|
|
|
freq = cpu_khz;
|
2005-06-23 15:08:34 +08:00
|
|
|
seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
|
2008-02-21 02:45:29 +08:00
|
|
|
freq / 1000, (freq % 1000));
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Cache size */
|
|
|
|
if (c->x86_cache_size >= 0)
|
|
|
|
seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
|
2008-02-21 02:45:29 +08:00
|
|
|
|
|
|
|
show_cpuinfo_core(m, c, cpu);
|
|
|
|
show_cpuinfo_misc(m, c);
|
|
|
|
|
|
|
|
seq_printf(m, "flags\t\t:");
|
|
|
|
for (i = 0; i < 32*NCAPINTS; i++)
|
|
|
|
if (cpu_has(c, i) && x86_cap_flags[i] != NULL)
|
2005-04-17 06:20:36 +08:00
|
|
|
seq_printf(m, " %s", x86_cap_flags[i]);
|
|
|
|
|
2008-02-21 02:47:12 +08:00
|
|
|
seq_printf(m, "\nbogomips\t: %lu.%02lu\n",
|
|
|
|
c->loops_per_jiffy/(500000/HZ),
|
|
|
|
(c->loops_per_jiffy/(5000/HZ)) % 100);
|
2008-02-21 02:48:02 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
if (c->x86_tlbsize > 0)
|
|
|
|
seq_printf(m, "TLB size\t: %d 4K pages\n", c->x86_tlbsize);
|
|
|
|
#endif
|
2008-02-21 02:47:12 +08:00
|
|
|
seq_printf(m, "clflush size\t: %u\n", c->x86_clflush_size);
|
2008-02-21 02:48:02 +08:00
|
|
|
seq_printf(m, "cache_alignment\t: %d\n", c->x86_cache_alignment);
|
|
|
|
seq_printf(m, "address sizes\t: %u bits physical, %u bits virtual\n",
|
|
|
|
c->x86_phys_bits, c->x86_virt_bits);
|
2008-02-21 02:47:12 +08:00
|
|
|
|
|
|
|
seq_printf(m, "power management:");
|
|
|
|
for (i = 0; i < 32; i++) {
|
2006-01-12 05:42:51 +08:00
|
|
|
if (c->x86_power & (1 << i)) {
|
|
|
|
if (i < ARRAY_SIZE(x86_power_flags) &&
|
|
|
|
x86_power_flags[i])
|
|
|
|
seq_printf(m, "%s%s",
|
2009-07-04 07:35:45 +08:00
|
|
|
x86_power_flags[i][0] ? " " : "",
|
2006-01-12 05:42:51 +08:00
|
|
|
x86_power_flags[i]);
|
|
|
|
else
|
|
|
|
seq_printf(m, " [%d]", i);
|
|
|
|
}
|
2008-02-21 02:47:12 +08:00
|
|
|
}
|
2006-01-12 05:42:51 +08:00
|
|
|
|
2008-02-21 02:47:12 +08:00
|
|
|
seq_printf(m, "\n\n");
|
2005-04-17 06:25:15 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *c_start(struct seq_file *m, loff_t *pos)
|
|
|
|
{
|
2007-10-20 02:35:04 +08:00
|
|
|
if (*pos == 0) /* just in case, cpu 0 is not the first */
|
2009-03-13 12:19:54 +08:00
|
|
|
*pos = cpumask_first(cpu_online_mask);
|
2008-10-22 12:42:30 +08:00
|
|
|
else
|
2009-03-13 12:19:54 +08:00
|
|
|
*pos = cpumask_next(*pos - 1, cpu_online_mask);
|
2008-10-22 12:42:30 +08:00
|
|
|
if ((*pos) < nr_cpu_ids)
|
2007-10-20 02:35:04 +08:00
|
|
|
return &cpu_data(*pos);
|
|
|
|
return NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2008-02-21 02:45:29 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static void *c_next(struct seq_file *m, void *v, loff_t *pos)
|
|
|
|
{
|
2008-10-22 12:42:30 +08:00
|
|
|
(*pos)++;
|
2005-04-17 06:20:36 +08:00
|
|
|
return c_start(m, pos);
|
|
|
|
}
|
2008-02-21 02:45:29 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
static void c_stop(struct seq_file *m, void *v)
|
|
|
|
{
|
|
|
|
}
|
2008-02-21 02:45:29 +08:00
|
|
|
|
2008-01-30 20:33:32 +08:00
|
|
|
const struct seq_operations cpuinfo_op = {
|
2005-04-17 06:20:36 +08:00
|
|
|
.start = c_start,
|
|
|
|
.next = c_next,
|
|
|
|
.stop = c_stop,
|
|
|
|
.show = show_cpuinfo,
|
|
|
|
};
|