blob: 32e86aa52743c54928b9d5feeea28bf129307e05 [file] [log] [blame]
Linus Torvalds1da177e2005-04-16 15:20:36 -07001#include <linux/init.h>
2#include <linux/kernel.h>
3
4#include <linux/string.h>
5#include <linux/bitops.h>
6#include <linux/smp.h>
Ingo Molnar83ce4002009-02-26 20:16:58 +01007#include <linux/sched.h>
Linus Torvalds1da177e2005-04-16 15:20:36 -07008#include <linux/thread_info.h>
Nick Piggin53e86b92005-11-13 16:07:23 -08009#include <linux/module.h>
Alan Cox8bdbd962009-07-04 00:35:45 +010010#include <linux/uaccess.h>
Linus Torvalds1da177e2005-04-16 15:20:36 -070011
12#include <asm/processor.h>
Sam Ravnborgd72b1b42007-10-17 18:04:33 +020013#include <asm/pgtable.h>
Linus Torvalds1da177e2005-04-16 15:20:36 -070014#include <asm/msr.h>
Harvey Harrison73bdb732008-02-04 16:48:04 +010015#include <asm/bugs.h>
Yinghai Lu1f442d72009-03-07 23:46:26 -080016#include <asm/cpu.h>
Linus Torvalds1da177e2005-04-16 15:20:36 -070017
Yinghai Lu185f3b92008-09-09 16:40:35 -070018#ifdef CONFIG_X86_64
Alan Cox8bdbd962009-07-04 00:35:45 +010019#include <linux/topology.h>
Yinghai Lu185f3b92008-09-09 16:40:35 -070020#include <asm/numa_64.h>
21#endif
22
Linus Torvalds1da177e2005-04-16 15:20:36 -070023#include "cpu.h"
24
25#ifdef CONFIG_X86_LOCAL_APIC
26#include <asm/mpspec.h>
27#include <asm/apic.h>
Linus Torvalds1da177e2005-04-16 15:20:36 -070028#endif
29
Thomas Petazzoni03ae5762008-02-15 12:00:23 +010030static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
Linus Torvalds1da177e2005-04-16 15:20:36 -070031{
Ingo Molnar99fb4d32009-01-26 04:30:41 +010032 /* Unmask CPUID levels if masked: */
H. Peter Anvin30a0fb92009-01-26 09:40:58 -080033 if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) {
Ingo Molnar99fb4d32009-01-26 04:30:41 +010034 u64 misc_enable;
H. Peter Anvin066941b2009-01-21 15:04:32 -080035
Ingo Molnar99fb4d32009-01-26 04:30:41 +010036 rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
37
38 if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) {
39 misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID;
40 wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
41 c->cpuid_level = cpuid_eax(0);
H. Peter Anvind9003292010-09-28 15:35:01 -070042 get_cpu_cap(c);
Ingo Molnar99fb4d32009-01-26 04:30:41 +010043 }
H. Peter Anvin066941b2009-01-21 15:04:32 -080044 }
45
Andi Kleen2b16a232008-01-30 13:32:40 +010046 if ((c->x86 == 0xf && c->x86_model >= 0x03) ||
47 (c->x86 == 0x6 && c->x86_model >= 0x0e))
48 set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
Yinghai Lu185f3b92008-09-09 16:40:35 -070049
H. Peter Anvin7a0fc402010-04-13 14:40:54 -070050 /*
51 * Atom erratum AAE44/AAF40/AAG38/AAH41:
52 *
53 * A race condition between speculative fetches and invalidating
54 * a large page. This is worked around in microcode, but we
55 * need the microcode to have already been loaded... so if it is
56 * not, recommend a BIOS update and disable large pages.
57 */
58 if (c->x86 == 6 && c->x86_model == 0x1c && c->x86_mask <= 2) {
59 u32 ucode, junk;
60
61 wrmsr(MSR_IA32_UCODE_REV, 0, 0);
62 sync_core();
63 rdmsr(MSR_IA32_UCODE_REV, junk, ucode);
64
65 if (ucode < 0x20e) {
66 printk(KERN_WARNING "Atom PSE erratum detected, BIOS microcode update recommended\n");
67 clear_cpu_cap(c, X86_FEATURE_PSE);
68 }
69 }
70
Yinghai Lu185f3b92008-09-09 16:40:35 -070071#ifdef CONFIG_X86_64
72 set_cpu_cap(c, X86_FEATURE_SYSENTER32);
73#else
74 /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */
75 if (c->x86 == 15 && c->x86_cache_alignment == 64)
76 c->x86_cache_alignment = 128;
77#endif
Venki Pallipadi40fb1712008-11-17 16:11:37 -080078
Jan Beulich13c6c532009-03-12 12:37:34 +000079 /* CPUID workaround for 0F33/0F34 CPU */
80 if (c->x86 == 0xF && c->x86_model == 0x3
81 && (c->x86_mask == 0x3 || c->x86_mask == 0x4))
82 c->x86_phys_bits = 36;
83
Venki Pallipadi40fb1712008-11-17 16:11:37 -080084 /*
85 * c->x86_power is 8000_0007 edx. Bit 8 is TSC runs at constant rate
Ingo Molnar83ce4002009-02-26 20:16:58 +010086 * with P/T states and does not stop in deep C-states.
87 *
88 * It is also reliable across cores and sockets. (but not across
89 * cabinets - we turn it off in that case explicitly.)
Venki Pallipadi40fb1712008-11-17 16:11:37 -080090 */
91 if (c->x86_power & (1 << 8)) {
92 set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
93 set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
Dimitri Sivanich14be1f72010-03-01 11:48:15 -060094 if (!check_tsc_unstable())
95 sched_clock_stable = 1;
Venki Pallipadi40fb1712008-11-17 16:11:37 -080096 }
97
H. Peter Anvin75a04812009-01-22 16:17:05 -080098 /*
99 * There is a known erratum on Pentium III and Core Solo
100 * and Core Duo CPUs.
101 * " Page with PAT set to WC while associated MTRR is UC
102 * may consolidate to UC "
103 * Because of this erratum, it is better to stick with
104 * setting WC in MTRR rather than using PAT on these CPUs.
105 *
106 * Enable PAT WC only on P4, Core 2 or later CPUs.
107 */
108 if (c->x86 == 6 && c->x86_model < 15)
109 clear_cpu_cap(c, X86_FEATURE_PAT);
Vegard Nossumf8561292008-04-04 00:53:23 +0200110
111#ifdef CONFIG_KMEMCHECK
112 /*
113 * P4s have a "fast strings" feature which causes single-
114 * stepping REP instructions to only generate a #DB on
115 * cache-line boundaries.
116 *
117 * Ingo Molnar reported a Pentium D (model 6) and a Xeon
118 * (model 2) with the same problem.
119 */
120 if (c->x86 == 15) {
121 u64 misc_enable;
122
123 rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
124
125 if (misc_enable & MSR_IA32_MISC_ENABLE_FAST_STRING) {
126 printk(KERN_INFO "kmemcheck: Disabling fast string operations\n");
127
128 misc_enable &= ~MSR_IA32_MISC_ENABLE_FAST_STRING;
129 wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
130 }
131 }
132#endif
Linus Torvalds1da177e2005-04-16 15:20:36 -0700133}
134
Yinghai Lu185f3b92008-09-09 16:40:35 -0700135#ifdef CONFIG_X86_32
Linus Torvalds1da177e2005-04-16 15:20:36 -0700136/*
137 * Early probe support logic for ppro memory erratum #50
138 *
139 * This is called before we do cpu ident work
140 */
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100141
Chuck Ebbert3bc9b762006-03-23 02:59:33 -0800142int __cpuinit ppro_with_ram_bug(void)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700143{
144 /* Uses data from early_cpu_detect now */
145 if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
146 boot_cpu_data.x86 == 6 &&
147 boot_cpu_data.x86_model == 1 &&
148 boot_cpu_data.x86_mask < 8) {
149 printk(KERN_INFO "Pentium Pro with Errata#50 detected. Taking evasive action.\n");
150 return 1;
151 }
152 return 0;
153}
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100154
Yinghai Lu185f3b92008-09-09 16:40:35 -0700155#ifdef CONFIG_X86_F00F_BUG
156static void __cpuinit trap_init_f00f_bug(void)
157{
158 __set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
159
160 /*
161 * Update the IDT descriptor and reload the IDT so that
162 * it uses the read-only mapped virtual address.
163 */
164 idt_descr.address = fix_to_virt(FIX_F00F_IDT);
165 load_idt(&idt_descr);
166}
167#endif
Yinghai Lu40527042008-09-09 16:40:38 -0700168
Yinghai Lu1f442d72009-03-07 23:46:26 -0800169static void __cpuinit intel_smp_check(struct cpuinfo_x86 *c)
170{
171#ifdef CONFIG_SMP
172 /* calling is from identify_secondary_cpu() ? */
Robert Richterf6e9456c2010-07-21 19:03:58 +0200173 if (!c->cpu_index)
Yinghai Lu1f442d72009-03-07 23:46:26 -0800174 return;
175
176 /*
177 * Mask B, Pentium, but not Pentium MMX
178 */
179 if (c->x86 == 5 &&
180 c->x86_mask >= 1 && c->x86_mask <= 4 &&
181 c->x86_model <= 3) {
182 /*
183 * Remember we have B step Pentia with bugs
184 */
185 WARN_ONCE(1, "WARNING: SMP operation may be unreliable"
186 "with B stepping processors.\n");
187 }
188#endif
189}
190
Yinghai Lu40527042008-09-09 16:40:38 -0700191static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
192{
193 unsigned long lo, hi;
194
195#ifdef CONFIG_X86_F00F_BUG
196 /*
197 * All current models of Pentium and Pentium with MMX technology CPUs
Alan Cox8bdbd962009-07-04 00:35:45 +0100198 * have the F0 0F bug, which lets nonprivileged users lock up the
199 * system.
Yinghai Lu40527042008-09-09 16:40:38 -0700200 * Note that the workaround only should be initialized once...
201 */
202 c->f00f_bug = 0;
203 if (!paravirt_enabled() && c->x86 == 5) {
204 static int f00f_workaround_enabled;
205
206 c->f00f_bug = 1;
207 if (!f00f_workaround_enabled) {
208 trap_init_f00f_bug();
209 printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");
210 f00f_workaround_enabled = 1;
211 }
212 }
213#endif
214
215 /*
216 * SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until
217 * model 3 mask 3
218 */
219 if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633)
220 clear_cpu_cap(c, X86_FEATURE_SEP);
221
222 /*
223 * P4 Xeon errata 037 workaround.
224 * Hardware prefetcher may cause stale data to be loaded into the cache.
225 */
226 if ((c->x86 == 15) && (c->x86_model == 1) && (c->x86_mask == 1)) {
227 rdmsr(MSR_IA32_MISC_ENABLE, lo, hi);
Vegard Nossumecab22a2009-02-20 11:56:38 +0100228 if ((lo & MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE) == 0) {
Yinghai Lu40527042008-09-09 16:40:38 -0700229 printk (KERN_INFO "CPU: C0 stepping P4 Xeon detected.\n");
230 printk (KERN_INFO "CPU: Disabling hardware prefetching (Errata 037)\n");
Vegard Nossumecab22a2009-02-20 11:56:38 +0100231 lo |= MSR_IA32_MISC_ENABLE_PREFETCH_DISABLE;
Alan Cox8bdbd962009-07-04 00:35:45 +0100232 wrmsr(MSR_IA32_MISC_ENABLE, lo, hi);
Yinghai Lu40527042008-09-09 16:40:38 -0700233 }
234 }
235
236 /*
237 * See if we have a good local APIC by checking for buggy Pentia,
238 * i.e. all B steppings and the C2 stepping of P54C when using their
239 * integrated APIC (see 11AP erratum in "Pentium Processor
240 * Specification Update").
241 */
242 if (cpu_has_apic && (c->x86<<8 | c->x86_model<<4) == 0x520 &&
243 (c->x86_mask < 0x6 || c->x86_mask == 0xb))
244 set_cpu_cap(c, X86_FEATURE_11AP);
245
246
247#ifdef CONFIG_X86_INTEL_USERCOPY
248 /*
249 * Set up the preferred alignment for movsl bulk memory moves
250 */
251 switch (c->x86) {
252 case 4: /* 486: untested */
253 break;
254 case 5: /* Old Pentia: untested */
255 break;
256 case 6: /* PII/PIII only like movsl with 8-byte alignment */
257 movsl_mask.mask = 7;
258 break;
259 case 15: /* P4 is OK down to 8-byte alignment */
260 movsl_mask.mask = 7;
261 break;
262 }
263#endif
264
265#ifdef CONFIG_X86_NUMAQ
266 numaq_tsc_disable();
267#endif
Yinghai Lu1f442d72009-03-07 23:46:26 -0800268
269 intel_smp_check(c);
Yinghai Lu40527042008-09-09 16:40:38 -0700270}
271#else
272static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
273{
274}
Yinghai Lu185f3b92008-09-09 16:40:35 -0700275#endif
276
Yinghai Lu2759c322009-05-15 13:05:16 -0700277static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)
Yinghai Lu185f3b92008-09-09 16:40:35 -0700278{
Tejun Heo645a7912011-01-23 14:37:40 +0100279#ifdef CONFIG_NUMA
Yinghai Lu185f3b92008-09-09 16:40:35 -0700280 unsigned node;
281 int cpu = smp_processor_id();
Yinghai Lu185f3b92008-09-09 16:40:35 -0700282
283 /* Don't do the funky fallback heuristics the AMD version employs
284 for now. */
Tejun Heobbc9e2f2011-01-23 14:37:39 +0100285 node = numa_cpu_node(cpu);
Nikanth Karthikesan50f2d7f2010-09-30 17:34:10 +0530286 if (node == NUMA_NO_NODE || !node_online(node)) {
Yinghai Lud9c2d5a2009-11-21 00:23:37 -0800287 /* reuse the value from init_cpu_to_node() */
288 node = cpu_to_node(cpu);
289 }
Yinghai Lu185f3b92008-09-09 16:40:35 -0700290 numa_set_node(cpu, node);
Yinghai Lu185f3b92008-09-09 16:40:35 -0700291#endif
292}
293
Andi Kleen3dd9d512005-04-16 15:25:15 -0700294/*
295 * find out the number of processor cores on the die
296 */
Yinghai Luf69feff2008-09-07 17:58:58 -0700297static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)
Andi Kleen3dd9d512005-04-16 15:25:15 -0700298{
Zachary Amsdenf2ab4462005-09-03 15:56:42 -0700299 unsigned int eax, ebx, ecx, edx;
Andi Kleen3dd9d512005-04-16 15:25:15 -0700300
301 if (c->cpuid_level < 4)
302 return 1;
303
Zachary Amsdenf2ab4462005-09-03 15:56:42 -0700304 /* Intel has a non-standard dependency on %ecx for this CPUID level. */
305 cpuid_count(4, 0, &eax, &ebx, &ecx, &edx);
Andi Kleen3dd9d512005-04-16 15:25:15 -0700306 if (eax & 0x1f)
Alan Cox8bdbd962009-07-04 00:35:45 +0100307 return (eax >> 26) + 1;
Andi Kleen3dd9d512005-04-16 15:25:15 -0700308 else
309 return 1;
310}
311
Sheng Yange38e05a2008-09-10 18:53:34 +0800312static void __cpuinit detect_vmx_virtcap(struct cpuinfo_x86 *c)
313{
314 /* Intel VMX MSR indicated features */
315#define X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW 0x00200000
316#define X86_VMX_FEATURE_PROC_CTLS_VNMI 0x00400000
317#define X86_VMX_FEATURE_PROC_CTLS_2ND_CTLS 0x80000000
318#define X86_VMX_FEATURE_PROC_CTLS2_VIRT_APIC 0x00000001
319#define X86_VMX_FEATURE_PROC_CTLS2_EPT 0x00000002
320#define X86_VMX_FEATURE_PROC_CTLS2_VPID 0x00000020
321
322 u32 vmx_msr_low, vmx_msr_high, msr_ctl, msr_ctl2;
323
324 clear_cpu_cap(c, X86_FEATURE_TPR_SHADOW);
325 clear_cpu_cap(c, X86_FEATURE_VNMI);
326 clear_cpu_cap(c, X86_FEATURE_FLEXPRIORITY);
327 clear_cpu_cap(c, X86_FEATURE_EPT);
328 clear_cpu_cap(c, X86_FEATURE_VPID);
329
330 rdmsr(MSR_IA32_VMX_PROCBASED_CTLS, vmx_msr_low, vmx_msr_high);
331 msr_ctl = vmx_msr_high | vmx_msr_low;
332 if (msr_ctl & X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW)
333 set_cpu_cap(c, X86_FEATURE_TPR_SHADOW);
334 if (msr_ctl & X86_VMX_FEATURE_PROC_CTLS_VNMI)
335 set_cpu_cap(c, X86_FEATURE_VNMI);
336 if (msr_ctl & X86_VMX_FEATURE_PROC_CTLS_2ND_CTLS) {
337 rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2,
338 vmx_msr_low, vmx_msr_high);
339 msr_ctl2 = vmx_msr_high | vmx_msr_low;
340 if ((msr_ctl2 & X86_VMX_FEATURE_PROC_CTLS2_VIRT_APIC) &&
341 (msr_ctl & X86_VMX_FEATURE_PROC_CTLS_TPR_SHADOW))
342 set_cpu_cap(c, X86_FEATURE_FLEXPRIORITY);
343 if (msr_ctl2 & X86_VMX_FEATURE_PROC_CTLS2_EPT)
344 set_cpu_cap(c, X86_FEATURE_EPT);
345 if (msr_ctl2 & X86_VMX_FEATURE_PROC_CTLS2_VPID)
346 set_cpu_cap(c, X86_FEATURE_VPID);
347 }
348}
349
Chuck Ebbert3bc9b762006-03-23 02:59:33 -0800350static void __cpuinit init_intel(struct cpuinfo_x86 *c)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700351{
352 unsigned int l2 = 0;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700353
Andi Kleen2b16a232008-01-30 13:32:40 +0100354 early_init_intel(c);
355
Yinghai Lu40527042008-09-09 16:40:38 -0700356 intel_workarounds(c);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700357
Suresh Siddha345077c2008-12-18 18:09:21 -0800358 /*
359 * Detect the extended topology information if available. This
360 * will reinitialise the initial_apicid which will be used
361 * in init_intel_cacheinfo()
362 */
363 detect_extended_topology(c);
364
Linus Torvalds1da177e2005-04-16 15:20:36 -0700365 l2 = init_intel_cacheinfo(c);
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100366 if (c->cpuid_level > 9) {
Venkatesh Pallipadi0080e662006-06-26 13:59:59 +0200367 unsigned eax = cpuid_eax(10);
368 /* Check for version and the number of counters */
369 if ((eax & 0xff) && (((eax>>8) & 0xff) > 1))
Ingo Molnard0e95eb2008-02-26 08:52:33 +0100370 set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);
Venkatesh Pallipadi0080e662006-06-26 13:59:59 +0200371 }
Linus Torvalds1da177e2005-04-16 15:20:36 -0700372
Yinghai Lu40527042008-09-09 16:40:38 -0700373 if (cpu_has_xmm2)
374 set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
375 if (cpu_has_ds) {
376 unsigned int l1;
377 rdmsr(MSR_IA32_MISC_ENABLE, l1, l2);
378 if (!(l1 & (1<<11)))
379 set_cpu_cap(c, X86_FEATURE_BTS);
380 if (!(l1 & (1<<12)))
381 set_cpu_cap(c, X86_FEATURE_PEBS);
Yinghai Lu40527042008-09-09 16:40:38 -0700382 }
Linus Torvalds1da177e2005-04-16 15:20:36 -0700383
Pallipadi, Venkateshe736ad52009-02-06 16:52:05 -0800384 if (c->x86 == 6 && c->x86_model == 29 && cpu_has_clflush)
385 set_cpu_cap(c, X86_FEATURE_CLFLUSH_MONITOR);
386
Yinghai Lu40527042008-09-09 16:40:38 -0700387#ifdef CONFIG_X86_64
388 if (c->x86 == 15)
389 c->x86_cache_alignment = c->x86_clflush_size * 2;
390 if (c->x86 == 6)
391 set_cpu_cap(c, X86_FEATURE_REP_GOOD);
392#else
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100393 /*
394 * Names for the Pentium II/Celeron processors
395 * detectable only by also checking the cache size.
396 * Dixon is NOT a Celeron.
397 */
Linus Torvalds1da177e2005-04-16 15:20:36 -0700398 if (c->x86 == 6) {
Yinghai Lu40527042008-09-09 16:40:38 -0700399 char *p = NULL;
400
Linus Torvalds1da177e2005-04-16 15:20:36 -0700401 switch (c->x86_model) {
402 case 5:
Ondrej Zary865be7a2011-05-16 21:38:08 +0200403 if (l2 == 0)
404 p = "Celeron (Covington)";
405 else if (l2 == 256)
406 p = "Mobile Pentium II (Dixon)";
Linus Torvalds1da177e2005-04-16 15:20:36 -0700407 break;
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100408
Linus Torvalds1da177e2005-04-16 15:20:36 -0700409 case 6:
410 if (l2 == 128)
411 p = "Celeron (Mendocino)";
412 else if (c->x86_mask == 0 || c->x86_mask == 5)
413 p = "Celeron-A";
414 break;
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100415
Linus Torvalds1da177e2005-04-16 15:20:36 -0700416 case 8:
417 if (l2 == 128)
418 p = "Celeron (Coppermine)";
419 break;
420 }
Yinghai Lu40527042008-09-09 16:40:38 -0700421
422 if (p)
423 strcpy(c->x86_model_id, p);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700424 }
425
Yinghai Lu185f3b92008-09-09 16:40:35 -0700426 if (c->x86 == 15)
427 set_cpu_cap(c, X86_FEATURE_P4);
428 if (c->x86 == 6)
429 set_cpu_cap(c, X86_FEATURE_P3);
Markus Metzgerf4166c52008-11-09 14:29:21 +0100430#endif
Yinghai Lu185f3b92008-09-09 16:40:35 -0700431
Yinghai Lu185f3b92008-09-09 16:40:35 -0700432 if (!cpu_has(c, X86_FEATURE_XTOPOLOGY)) {
433 /*
434 * let's use the legacy cpuid vector 0x1 and 0x4 for topology
435 * detection.
436 */
437 c->x86_max_cores = intel_num_cpu_cores(c);
438#ifdef CONFIG_X86_32
439 detect_ht(c);
440#endif
441 }
442
443 /* Work around errata */
Yinghai Lu2759c322009-05-15 13:05:16 -0700444 srat_detect_node(c);
Sheng Yange38e05a2008-09-10 18:53:34 +0800445
446 if (cpu_has(c, X86_FEATURE_VMX))
447 detect_vmx_virtcap(c);
Stephane Eranian42ed4582006-12-07 02:14:01 +0100448}
Linus Torvalds1da177e2005-04-16 15:20:36 -0700449
Yinghai Lu185f3b92008-09-09 16:40:35 -0700450#ifdef CONFIG_X86_32
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100451static unsigned int __cpuinit intel_size_cache(struct cpuinfo_x86 *c, unsigned int size)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700452{
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100453 /*
454 * Intel PIII Tualatin. This comes in two flavours.
Linus Torvalds1da177e2005-04-16 15:20:36 -0700455 * One has 256kb of cache, the other 512. We have no way
456 * to determine which, so we use a boottime override
457 * for the 512kb model, and assume 256 otherwise.
458 */
459 if ((c->x86 == 6) && (c->x86_model == 11) && (size == 0))
460 size = 256;
461 return size;
462}
Yinghai Lu185f3b92008-09-09 16:40:35 -0700463#endif
Linus Torvalds1da177e2005-04-16 15:20:36 -0700464
Jan Beulich02dde8b2009-03-12 12:08:49 +0000465static const struct cpu_dev __cpuinitconst intel_cpu_dev = {
Linus Torvalds1da177e2005-04-16 15:20:36 -0700466 .c_vendor = "Intel",
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100467 .c_ident = { "GenuineIntel" },
Yinghai Lu185f3b92008-09-09 16:40:35 -0700468#ifdef CONFIG_X86_32
Linus Torvalds1da177e2005-04-16 15:20:36 -0700469 .c_models = {
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100470 { .vendor = X86_VENDOR_INTEL, .family = 4, .model_names =
471 {
472 [0] = "486 DX-25/33",
473 [1] = "486 DX-50",
474 [2] = "486 SX",
475 [3] = "486 DX/2",
476 [4] = "486 SL",
477 [5] = "486 SX/2",
478 [7] = "486 DX/2-WB",
479 [8] = "486 DX/4",
Linus Torvalds1da177e2005-04-16 15:20:36 -0700480 [9] = "486 DX/4-WB"
481 }
482 },
483 { .vendor = X86_VENDOR_INTEL, .family = 5, .model_names =
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100484 {
485 [0] = "Pentium 60/66 A-step",
486 [1] = "Pentium 60/66",
Linus Torvalds1da177e2005-04-16 15:20:36 -0700487 [2] = "Pentium 75 - 200",
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100488 [3] = "OverDrive PODP5V83",
Linus Torvalds1da177e2005-04-16 15:20:36 -0700489 [4] = "Pentium MMX",
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100490 [7] = "Mobile Pentium 75 - 200",
Linus Torvalds1da177e2005-04-16 15:20:36 -0700491 [8] = "Mobile Pentium MMX"
492 }
493 },
494 { .vendor = X86_VENDOR_INTEL, .family = 6, .model_names =
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100495 {
Linus Torvalds1da177e2005-04-16 15:20:36 -0700496 [0] = "Pentium Pro A-step",
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100497 [1] = "Pentium Pro",
498 [3] = "Pentium II (Klamath)",
499 [4] = "Pentium II (Deschutes)",
500 [5] = "Pentium II (Deschutes)",
Linus Torvalds1da177e2005-04-16 15:20:36 -0700501 [6] = "Mobile Pentium II",
Paolo Ciarrocchi65eb6b42008-02-22 23:09:42 +0100502 [7] = "Pentium III (Katmai)",
503 [8] = "Pentium III (Coppermine)",
Linus Torvalds1da177e2005-04-16 15:20:36 -0700504 [10] = "Pentium III (Cascades)",
505 [11] = "Pentium III (Tualatin)",
506 }
507 },
508 { .vendor = X86_VENDOR_INTEL, .family = 15, .model_names =
509 {
510 [0] = "Pentium 4 (Unknown)",
511 [1] = "Pentium 4 (Willamette)",
512 [2] = "Pentium 4 (Northwood)",
513 [4] = "Pentium 4 (Foster)",
514 [5] = "Pentium 4 (Foster)",
515 }
516 },
517 },
Yinghai Lu185f3b92008-09-09 16:40:35 -0700518 .c_size_cache = intel_size_cache,
519#endif
Thomas Petazzoni03ae5762008-02-15 12:00:23 +0100520 .c_early_init = early_init_intel,
Linus Torvalds1da177e2005-04-16 15:20:36 -0700521 .c_init = init_intel,
Yinghai Lu10a434f2008-09-04 21:09:45 +0200522 .c_x86_vendor = X86_VENDOR_INTEL,
Linus Torvalds1da177e2005-04-16 15:20:36 -0700523};
524
Yinghai Lu10a434f2008-09-04 21:09:45 +0200525cpu_dev_register(intel_cpu_dev);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700526