]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/blob - arch/x86/kernel/cpu/proc.c
Revert "x86: CPU: Fix up "cpu MHz" in /proc/cpuinfo"
[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / cpu / proc.c
1 #include <linux/smp.h>
2 #include <linux/timex.h>
3 #include <linux/string.h>
4 #include <linux/seq_file.h>
5 #include <linux/cpufreq.h>
6
7 /*
8 * Get CPU information for use by the procfs.
9 */
10 static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
11 unsigned int cpu)
12 {
13 #ifdef CONFIG_SMP
14 seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
15 seq_printf(m, "siblings\t: %d\n",
16 cpumask_weight(topology_core_cpumask(cpu)));
17 seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
18 seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
19 seq_printf(m, "apicid\t\t: %d\n", c->apicid);
20 seq_printf(m, "initial apicid\t: %d\n", c->initial_apicid);
21 #endif
22 }
23
24 #ifdef CONFIG_X86_32
25 static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
26 {
27 seq_printf(m,
28 "fdiv_bug\t: %s\n"
29 "f00f_bug\t: %s\n"
30 "coma_bug\t: %s\n"
31 "fpu\t\t: %s\n"
32 "fpu_exception\t: %s\n"
33 "cpuid level\t: %d\n"
34 "wp\t\t: yes\n",
35 static_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no",
36 static_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",
37 static_cpu_has_bug(X86_BUG_COMA) ? "yes" : "no",
38 static_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",
39 static_cpu_has(X86_FEATURE_FPU) ? "yes" : "no",
40 c->cpuid_level);
41 }
42 #else
43 static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
44 {
45 seq_printf(m,
46 "fpu\t\t: yes\n"
47 "fpu_exception\t: yes\n"
48 "cpuid level\t: %d\n"
49 "wp\t\t: yes\n",
50 c->cpuid_level);
51 }
52 #endif
53
54 static int show_cpuinfo(struct seq_file *m, void *v)
55 {
56 struct cpuinfo_x86 *c = v;
57 unsigned int cpu;
58 int i;
59
60 cpu = c->cpu_index;
61 seq_printf(m, "processor\t: %u\n"
62 "vendor_id\t: %s\n"
63 "cpu family\t: %d\n"
64 "model\t\t: %u\n"
65 "model name\t: %s\n",
66 cpu,
67 c->x86_vendor_id[0] ? c->x86_vendor_id : "unknown",
68 c->x86,
69 c->x86_model,
70 c->x86_model_id[0] ? c->x86_model_id : "unknown");
71
72 if (c->x86_mask || c->cpuid_level >= 0)
73 seq_printf(m, "stepping\t: %d\n", c->x86_mask);
74 else
75 seq_puts(m, "stepping\t: unknown\n");
76 if (c->microcode)
77 seq_printf(m, "microcode\t: 0x%x\n", c->microcode);
78
79 if (cpu_has(c, X86_FEATURE_TSC)) {
80 unsigned int freq = cpufreq_quick_get(cpu);
81
82 if (!freq)
83 freq = cpu_khz;
84 seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
85 freq / 1000, (freq % 1000));
86 }
87
88 /* Cache size */
89 if (c->x86_cache_size >= 0)
90 seq_printf(m, "cache size\t: %d KB\n", c->x86_cache_size);
91
92 show_cpuinfo_core(m, c, cpu);
93 show_cpuinfo_misc(m, c);
94
95 seq_puts(m, "flags\t\t:");
96 for (i = 0; i < 32*NCAPINTS; i++)
97 if (cpu_has(c, i) && x86_cap_flags[i] != NULL)
98 seq_printf(m, " %s", x86_cap_flags[i]);
99
100 seq_puts(m, "\nbugs\t\t:");
101 for (i = 0; i < 32*NBUGINTS; i++) {
102 unsigned int bug_bit = 32*NCAPINTS + i;
103
104 if (cpu_has_bug(c, bug_bit) && x86_bug_flags[i])
105 seq_printf(m, " %s", x86_bug_flags[i]);
106 }
107
108 seq_printf(m, "\nbogomips\t: %lu.%02lu\n",
109 c->loops_per_jiffy/(500000/HZ),
110 (c->loops_per_jiffy/(5000/HZ)) % 100);
111
112 #ifdef CONFIG_X86_64
113 if (c->x86_tlbsize > 0)
114 seq_printf(m, "TLB size\t: %d 4K pages\n", c->x86_tlbsize);
115 #endif
116 seq_printf(m, "clflush size\t: %u\n", c->x86_clflush_size);
117 seq_printf(m, "cache_alignment\t: %d\n", c->x86_cache_alignment);
118 seq_printf(m, "address sizes\t: %u bits physical, %u bits virtual\n",
119 c->x86_phys_bits, c->x86_virt_bits);
120
121 seq_puts(m, "power management:");
122 for (i = 0; i < 32; i++) {
123 if (c->x86_power & (1 << i)) {
124 if (i < ARRAY_SIZE(x86_power_flags) &&
125 x86_power_flags[i])
126 seq_printf(m, "%s%s",
127 x86_power_flags[i][0] ? " " : "",
128 x86_power_flags[i]);
129 else
130 seq_printf(m, " [%d]", i);
131 }
132 }
133
134 seq_puts(m, "\n\n");
135
136 return 0;
137 }
138
139 static void *c_start(struct seq_file *m, loff_t *pos)
140 {
141 *pos = cpumask_next(*pos - 1, cpu_online_mask);
142 if ((*pos) < nr_cpu_ids)
143 return &cpu_data(*pos);
144 return NULL;
145 }
146
147 static void *c_next(struct seq_file *m, void *v, loff_t *pos)
148 {
149 (*pos)++;
150 return c_start(m, pos);
151 }
152
153 static void c_stop(struct seq_file *m, void *v)
154 {
155 }
156
157 const struct seq_operations cpuinfo_op = {
158 .start = c_start,
159 .next = c_next,
160 .stop = c_stop,
161 .show = show_cpuinfo,
162 };