x86: cpu make amd.c more like amd_64.c v2
PATCH 1/9 x86: cpu make amd.c more like amd_64.c v2
1. make 32bit have early_init_amd_mc and amd_detect_cmp
2. seperate init_amd_k5/k6/k7 ...
v2: fix compiling for !CONFIG_SMP
--- arch/x86/kernel/cpu/amd.c | 396 ++++++++++++++++++++++++------------------ arch/x86/kernel/cpu/amd_64.c | 17 +- arch/x86/kernel/cpu/common.c | 2 +- include/asm-x86/processor.h | 2 +- 4 files changed, 236 insertions(+), 181 deletions(-)
arch/x86/kernel/cpu/amd.c +224 -172
@@ -24,8 +24,200 @@extern void vide (void ); __asm__(".align 4\nvide: ret" ); +static void __cpuinit init_amd_k5 (struct cpuinfo_x86 *c) +{ +/* +* General Systems BIOSen alias the cpu frequency registers +* of the Elan at 0x000df000. Unfortuantly, one of the Linux +* drivers subsequently pokes it, and changes the CPU speed. +* Workaround : Remove the unneeded alias. +*/ +#define CBAR (0xfffc)/* Configuration Base Address (32-bit) */ +#define CBAR_ENB (0x80000000) +#define CBAR_KEY (0X000000CB) +if (c->x86_model ==9 || c->x86_model ==10 ) { +if (inl (CBAR ) &CBAR_ENB ) +outl (0 |CBAR_KEY ,CBAR ); + } +} + + +static void __cpuinit init_amd_k6 (struct cpuinfo_x86 *c) +{ +u32 l, h; +int mbytes = num_physpages >> (20 -PAGE_SHIFT ); + +if (c->x86_model <6 ) { +/* Based on AMD doc 20734R - June 2000 */ +if (c->x86_model ==0 ) { +clear_cpu_cap (c,X86_FEATURE_APIC ); +set_cpu_cap (c,X86_FEATURE_PGE ); + } +return ; + } + +if (c->x86_model ==6 && c->x86_mask ==1 ) { +const int K6_BUG_LOOP =1000000 ; +int n; +void (*f_vide)(void ); +unsigned long d, d2; + +printk (KERN_INFO "AMD K6 stepping B detected - " ); + +/* +* It looks like AMD fixed the 2.6.2 bug and improved indirect +* calls at the same time. +*/ + + n =K6_BUG_LOOP ; + f_vide = vide; +rdtscl (d); +while (n--) +f_vide (); +rdtscl (d2); + d = d2-d; + +if (d >20 *K6_BUG_LOOP ) +printk ("system stability may be impaired when more than 32 MB are used.\n" ); +else +printk ("probably OK (after B9730xxxx).\n" ); +printk (KERN_INFO "Please see http://membres.lycos.fr/poulot/k6bug.html\n" ); + } + +/* K6 with old style WHCR */ +if (c->x86_model <8 || + (c->x86_model ==8 && c->x86_mask <8 )) { +/* We can only write allocate on the low 508Mb */ +if (mbytes >508 ) + mbytes =508 ; + +rdmsr (MSR_K6_WHCR , l, h); +if ((l&0x0000FFFF ) ==0 ) { +unsigned long flags; + l = (1 <<0 )|((mbytes/4 )<<1 ); +local_irq_save (flags); +wbinvd (); +wrmsr (MSR_K6_WHCR , l, h); +local_irq_restore (flags); +printk (KERN_INFO "Enabling old style K6 write allocation for %d Mb\n" , + mbytes); + } +return ; + } + +if ((c->x86_model ==8 && c->x86_mask >7 ) || + c->x86_model ==9 || c->x86_model ==13 ) { +/* The more serious chips .. */ + +if (mbytes >4092 ) + mbytes =4092 ; + +rdmsr (MSR_K6_WHCR , l, h); +if ((l&0xFFFF0000 ) ==0 ) { +unsigned long flags; + l = ((mbytes>>2 )<<22 )|(1 <<16 ); +local_irq_save (flags); +wbinvd (); +wrmsr (MSR_K6_WHCR , l, h); +local_irq_restore (flags); +printk (KERN_INFO "Enabling new style K6 write allocation for %d Mb\n" , + mbytes); + } + +return ; + } + +if (c->x86_model ==10 ) { +/* AMD Geode LX is model 10 */ +/* placeholder for any needed mods */ +return ; + } +} + +static void __cpuinit init_amd_k7 (struct cpuinfo_x86 *c) +{ +u32 l, h; + +/* +* Bit 15 of Athlon specific MSR 15, needs to be 0 +* to enable SSE on Palomino/Morgan/Barton CPU's. +* If the BIOS didn't enable it already, enable it here. +*/ +if (c->x86_model >=6 && c->x86_model <=10 ) { +if (!cpu_has (c,X86_FEATURE_XMM )) { +printk (KERN_INFO "Enabling disabled K7/SSE Support.\n" ); +rdmsr (MSR_K7_HWCR , l, h); + l &= ~0x00008000 ; +wrmsr (MSR_K7_HWCR , l, h); +set_cpu_cap (c,X86_FEATURE_XMM ); + } + } + +/* +* It's been determined by AMD that Athlons since model 8 stepping 1 +* are more robust with CLK_CTL set to 200xxxxx instead of 600xxxxx +* As per AMD technical note 27212 0.2 +*/ +if ((c->x86_model ==8 && c->x86_mask >=1 ) || (c->x86_model >8 )) { +rdmsr (MSR_K7_CLK_CTL , l, h); +if ((l &0xfff00000 ) !=0x20000000 ) { +printk ("CPU: CLK_CTL MSR was %x. Reprogramming to %x\n" , l, + ((l &0x000fffff )|0x20000000 )); +wrmsr (MSR_K7_CLK_CTL , (l &0x000fffff )|0x20000000 , h); + } + } + +set_cpu_cap (c,X86_FEATURE_K7 ); +} + +/* +* On a AMD dual core setup the lower bits of the APIC id distingush the cores. +* Assumes number of cores is a power of two. +*/ +static void __cpuinit amd_detect_cmp (struct cpuinfo_x86 *c) +{ +#ifdef CONFIG_X86_HT +unsigned bits; + + bits = c->x86_coreid_bits; + +/* Low order bits define the core id (index of core in socket) */ + c->cpu_core_id = c->initial_apicid & ((1 << bits)-1 ); +/* Convert the initial APIC ID into the socket ID */ + c->phys_proc_id = c->initial_apicid >> bits; +#endif +} + +static void __cpuinit early_init_amd_mc (struct cpuinfo_x86 *c) +{ +#ifdef CONFIG_X86_HT +unsigned bits, ecx; + +/* Multi core CPU? */ +if (c->extended_cpuid_level <0x80000008 ) +return ; + + ecx =cpuid_ecx (0x80000008 ); + + c->x86_max_cores = (ecx &0xff ) +1 ; + +/* CPU telling us the core id bits shift? */ + bits = (ecx >>12 ) &0xF ; + +/* Otherwise recompute */ +if (bits ==0 ) { +while ((1 << bits) < c->x86_max_cores) + bits++; + } + + c->x86_coreid_bits = bits; +#endif +} +static void __cpuinit early_init_amd (struct cpuinfo_x86 *c) { +early_init_amd_mc (c); +if (c->x86_power & (1 <<8 ))set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC );
@@ -37,9 +229,6 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)static void __cpuinit init_amd (struct cpuinfo_x86 *c) { -u32 l, h; -int mbytes = num_physpages >> (20 -PAGE_SHIFT ); -#ifdef CONFIG_SMP unsigned long long value;
@@ -50,7 +239,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)* Errata 63 for SH-B3 steppings * Errata 122 for all steppings (F+ have it disabled by default) */ -if (c->x86 ==15 ) { +if (c->x86 ==0xf ) {rdmsrl (MSR_K7_HWCR , value); value |=1 <<6 ;wrmsrl (MSR_K7_HWCR , value);
@@ -73,192 +262,55 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)switch (c->x86) {case 4 : -/* -* General Systems BIOSen alias the cpu frequency registers -* of the Elan at 0x000df000. Unfortuantly, one of the Linux -* drivers subsequently pokes it, and changes the CPU speed. -* Workaround : Remove the unneeded alias. -*/ -#define CBAR (0xfffc)/* Configuration Base Address (32-bit) */ -#define CBAR_ENB (0x80000000) -#define CBAR_KEY (0X000000CB) -if (c->x86_model ==9 || c->x86_model ==10 ) { -if (inl (CBAR ) &CBAR_ENB ) -outl (0 |CBAR_KEY ,CBAR ); - } -break ; +init_amd_k5 (c); +break ;case 5 : -if (c->x86_model <6 ) { -/* Based on AMD doc 20734R - June 2000 */ -if (c->x86_model ==0 ) { -clear_cpu_cap (c,X86_FEATURE_APIC ); -set_cpu_cap (c,X86_FEATURE_PGE ); - } -break ; - } - -if (c->x86_model ==6 && c->x86_mask ==1 ) { -const int K6_BUG_LOOP =1000000 ; -int n; -void (*f_vide)(void ); -unsigned long d, d2; - -printk (KERN_INFO "AMD K6 stepping B detected - " ); - -/* -* It looks like AMD fixed the 2.6.2 bug and improved indirect -* calls at the same time. -*/ - - n =K6_BUG_LOOP ; - f_vide = vide; -rdtscl (d); -while (n--) -f_vide (); -rdtscl (d2); - d = d2-d; - -if (d >20 *K6_BUG_LOOP ) -printk ("system stability may be impaired when more than 32 MB are used.\n" ); -else -printk ("probably OK (after B9730xxxx).\n" ); -printk (KERN_INFO "Please see http://membres.lycos.fr/poulot/k6bug.html\n" ); - } - -/* K6 with old style WHCR */ -if (c->x86_model <8 || - (c->x86_model ==8 && c->x86_mask <8 )) { -/* We can only write allocate on the low 508Mb */ -if (mbytes >508 ) - mbytes =508 ; - -rdmsr (MSR_K6_WHCR , l, h); -if ((l&0x0000FFFF ) ==0 ) { -unsigned long flags; - l = (1 <<0 )|((mbytes/4 )<<1 ); -local_irq_save (flags); -wbinvd (); -wrmsr (MSR_K6_WHCR , l, h); -local_irq_restore (flags); -printk (KERN_INFO "Enabling old style K6 write allocation for %d Mb\n" , - mbytes); - } -break ; - } - -if ((c->x86_model ==8 && c->x86_mask >7 ) || - c->x86_model ==9 || c->x86_model ==13 ) { -/* The more serious chips .. */ - -if (mbytes >4092 ) - mbytes =4092 ; - -rdmsr (MSR_K6_WHCR , l, h); -if ((l&0xFFFF0000 ) ==0 ) { -unsigned long flags; - l = ((mbytes>>2 )<<22 )|(1 <<16 ); -local_irq_save (flags); -wbinvd (); -wrmsr (MSR_K6_WHCR , l, h); -local_irq_restore (flags); -printk (KERN_INFO "Enabling new style K6 write allocation for %d Mb\n" , - mbytes); - } - -break ; - } - -if (c->x86_model ==10 ) { -/* AMD Geode LX is model 10 */ -/* placeholder for any needed mods */ -break ; - } -break ; -case 6 :/* An Athlon/Duron */ - -/* -* Bit 15 of Athlon specific MSR 15, needs to be 0 -* to enable SSE on Palomino/Morgan/Barton CPU's. -* If the BIOS didn't enable it already, enable it here. -*/ -if (c->x86_model >=6 && c->x86_model <=10 ) { -if (!cpu_has (c,X86_FEATURE_XMM )) { -printk (KERN_INFO "Enabling disabled K7/SSE Support.\n" ); -rdmsr (MSR_K7_HWCR , l, h); - l &= ~0x00008000 ; -wrmsr (MSR_K7_HWCR , l, h); -set_cpu_cap (c,X86_FEATURE_XMM ); - } - } - -/* -* It's been determined by AMD that Athlons since model 8 stepping 1 -* are more robust with CLK_CTL set to 200xxxxx instead of 600xxxxx -* As per AMD technical note 27212 0.2 -*/ -if ((c->x86_model ==8 && c->x86_mask >=1 ) || (c->x86_model >8 )) { -rdmsr (MSR_K7_CLK_CTL , l, h); -if ((l &0xfff00000 ) !=0x20000000 ) { -printk ("CPU: CLK_CTL MSR was %x. Reprogramming to %x\n" , l, - ((l &0x000fffff )|0x20000000 )); -wrmsr (MSR_K7_CLK_CTL , (l &0x000fffff )|0x20000000 , h); - } - } -break ; - } - -switch (c->x86) { -case 15 : -/* Use K8 tuning for Fam10h and Fam11h */ -case 0x10 : -case 0x11 : -set_cpu_cap (c,X86_FEATURE_K8 ); +init_amd_k6 (c);break ; -case 6 : -set_cpu_cap (c,X86_FEATURE_K7 ); +case 6 :/* An Athlon/Duron */ +init_amd_k7 (c);break ; } + +/* K6s reports MCEs but don't actually have all the MSRs */ +if (c->x86 <6 ) +clear_cpu_cap (c,X86_FEATURE_MCE ); +if (c->x86 >=6 )set_cpu_cap (c,X86_FEATURE_FXSAVE_LEAK ); -display_cacheinfo (c); +if (!c->x86_model_id[0 ]) { +switch (c->x86) { +case 0xf : +/* Should distinguish Models here, but this is only +a fallback anyways. */ +strcpy (c->x86_model_id,"Hammer" ); +break ; + } + } -if (cpuid_eax (0x80000000 ) >=0x80000008 ) - c->x86_max_cores = (cpuid_ecx (0x80000008 ) &0xff ) +1 ; +display_cacheinfo (c); -#ifdef CONFIG_X86_HT -/* -* On a AMD multi core setup the lower bits of the APIC id -* distinguish the cores. -*/ -if (c->x86_max_cores >1 ) { -int cpu =smp_processor_id (); -unsigned bits = (cpuid_ecx (0x80000008 ) >>12 ) &0xf ; +/* Multi core CPU? */ +if (c->extended_cpuid_level >=0x80000008 ) +amd_detect_cmp (c); -if (bits ==0 ) { -while ((1 << bits) < c->x86_max_cores) - bits++; - } - c->cpu_core_id = c->phys_proc_id & ((1 <<bits)-1 ); - c->phys_proc_id >>= bits; -printk (KERN_INFO "CPU %d(%d) -> Core %d\n" , - cpu, c->x86_max_cores, c->cpu_core_id); - } -#endif +detect_ht (c); -if (cpuid_eax (0x80000000 ) >=0x80000006 ) { -if ((c->x86 ==0x10 ) && (cpuid_edx (0x80000006 ) &0xf000 )) +if (c->extended_cpuid_level >=0x80000006 ) { +if ((c->x86 >=0x0f ) && (cpuid_edx (0x80000006 ) &0xf000 )) num_cache_leaves =4 ;else num_cache_leaves =3 ; } -/* K6s reports MCEs but don't actually have all the MSRs */ -if (c->x86 <6 ) -clear_cpu_cap (c,X86_FEATURE_MCE ); +if (c->x86 >=0xf && c->x86 <=0x11 ) +set_cpu_cap (c,X86_FEATURE_K8 ); -if (cpu_has_xmm2) +if (cpu_has_xmm2) { +/* MFENCE stops RDTSC speculation */ set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); + } }static unsigned int __cpuinit amd_size_cache (struct cpuinfo_x86 *c,unsigned int size)
arch/x86/kernel/cpu/amd_64.c +10 -7
@@ -174,17 +174,20 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)if (c->extended_cpuid_level >=0x80000008 )amd_detect_cmp (c); -if (c->extended_cpuid_level >=0x80000006 && - (cpuid_edx (0x80000006 ) &0xf000 )) - num_cache_leaves =4 ; -else - num_cache_leaves =3 ; +if (c->extended_cpuid_level >=0x80000006 ) { +if ((c->x86 >=0x0f ) && (cpuid_edx (0x80000006 ) &0xf000 )) + num_cache_leaves =4 ; +else + num_cache_leaves =3 ; + }if (c->x86 >=0xf && c->x86 <=0x11 )set_cpu_cap (c,X86_FEATURE_K8 ); -/* MFENCE stops RDTSC speculation */ -set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); +if (cpu_has_xmm2) { +/* MFENCE stops RDTSC speculation */ +set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); + }if (c->x86 ==0x10 ) {/* do this for boot cpu */
arch/x86/kernel/cpu/common.c +1 -1
@@ -629,8 +629,8 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) c->x86_vendor_id[0 ] ='\0' ;/* Unset */ c->x86_model_id[0 ] ='\0' ;/* Unset */ c->x86_max_cores =1 ; -#ifdef CONFIG_X86_64 c->x86_coreid_bits =0 ; +#ifdef CONFIG_X86_64 c->x86_clflush_size =64 ;#else c->cpuid_level =-1 ;/* CPUID not detected */
include/asm-x86/processor.h +1 -1
@@ -76,9 +76,9 @@ struct cpuinfo_x86 {int x86_tlbsize;__u8 x86_virt_bits;__u8 x86_phys_bits; +#endif /* CPUID returned core id bits: */ __u8 x86_coreid_bits; -#endif /* Max extended CPUID function supported: */ __u32 extended_cpuid_level;/* Maximum supported CPUID level, -1=no CPUID: */
Signature · 1 line
1.5.4.5
PATCH 2/9 x86: remove duplicated force_mwait
--- arch/x86/kernel/cpu/amd_64.c | 2 -- arch/x86/kernel/process.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/amd_64.c +0 -2
@@ -9,8 +9,6 @@#include "cpu.h" -int force_mwait__cpuinitdata ; -#ifdef CONFIG_NUMA static int __cpuinit nearby_node (int apicid) {
arch/x86/kernel/process.c +0 -1
@@ -15,7 +15,6 @@ unsigned long idle_nomwait;EXPORT_SYMBOL (idle_nomwait);struct kmem_cache *task_xstate_cachep; -static int force_mwait__cpuinitdata ;int arch_dup_task_struct (struct task_struct *dst,struct task_struct *src) {
Signature · 1 line
1.5.4.5
PATCH 3/9 x86: add srat_detect_node for amd64
In reply to Yinghai Luseperate that from amd_detect_cmp()
--- arch/x86/kernel/cpu/amd_64.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-)
arch/x86/kernel/cpu/amd_64.c +12 -7
@@ -36,19 +36,23 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) {#ifdef CONFIG_SMP unsigned bits; -#ifdef CONFIG_NUMA -int cpu =smp_processor_id (); -int node =0 ; -unsigned apicid =hard_smp_processor_id (); -#endif + bits = c->x86_coreid_bits;/* Low order bits define the core id (index of core in socket) */ c->cpu_core_id = c->initial_apicid & ((1 << bits)-1 );/* Convert the initial APIC ID into the socket ID */ c->phys_proc_id = c->initial_apicid >> bits; +#endif +} +static void __cpuinit srat_detect_node (struct cpuinfo_x86 *c) +{#ifdef CONFIG_NUMA +int cpu =smp_processor_id (); +int node; +unsigned apicid =hard_smp_processor_id (); + node = c->phys_proc_id;if (apicid_to_node[apicid] !=NUMA_NO_NODE ) node = apicid_to_node[apicid];
@@ -76,7 +80,6 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)printk (KERN_INFO "CPU %d/%x -> Node %d\n" , cpu, apicid, node);#endif -#endif }static void __cpuinit early_init_amd_mc (struct cpuinfo_x86 *c)
@@ -169,8 +172,10 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)display_cacheinfo (c);/* Multi core CPU? */ -if (c->extended_cpuid_level >=0x80000008 ) +if (c->extended_cpuid_level >=0x80000008 ) {amd_detect_cmp (c); +srat_detect_node (c); + }if (c->extended_cpuid_level >=0x80000006 ) {if ((c->x86 >=0x0f ) && (cpuid_edx (0x80000006 ) &0xf000 ))
Signature · 1 line
1.5.4.5
PATCH 4/9 x86: merge header in amd/64.c
In reply to Yinghai Lu--- arch/x86/kernel/cpu/amd.c | 8 ++++++++ arch/x86/kernel/cpu/amd_64.c | 13 ++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/amd.c +8 -0
@@ -1,11 +1,19 @@#include <linux/init.h> #include <linux/bitops.h> #include <linux/mm.h> +#include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> +#ifdef CONFIG_X86_64 +# include <asm/numa_64.h> +# include <asm/mmconfig.h> +# include <asm/cacheflush.h> +#endif +#include <mach_apic.h> +#include "cpu.h" /*
arch/x86/kernel/cpu/amd_64.c +10 -3
@@ -1,9 +1,16 @@#include <linux/init.h> +#include <linux/bitops.h> #include <linux/mm.h> -#include <asm/numa_64.h> -#include <asm/mmconfig.h> -#include <asm/cacheflush.h> +#include <asm/io.h> +#include <asm/processor.h> +#include <asm/apic.h> + +#ifdef CONFIG_X86_64 +# include <asm/numa_64.h> +# include <asm/mmconfig.h> +# include <asm/cacheflush.h> +#endif #include <mach_apic.h>
Signature · 1 line
1.5.4.5
PATCH 5/9 x86: make amd.c have 64bit support code
In reply to Yinghai Lu--- arch/x86/kernel/cpu/amd.c | 137 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 126 insertions(+), 11 deletions(-)
arch/x86/kernel/cpu/amd.c +126 -11
@@ -16,6 +16,7 @@#include "cpu.h" +#ifdef CONFIG_X86_32 /* * B step AMD K6 before B 9730xxxx have hardware bugs that can cause * misexecution of code under Linux. Owners of such processors should
@@ -177,6 +178,26 @@ static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c) set_cpu_cap(c, X86_FEATURE_K7); } +#endif + +#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 ) +static int __cpuinit nearby_node (int apicid) +{ +int i, node; + +for (i = apicid -1 ; i >=0 ; i--) { + node = apicid_to_node[i]; +if (node !=NUMA_NO_NODE &&node_online (node)) +return node; + } +for (i = apicid +1 ; i <MAX_LOCAL_APIC ; i++) { + node = apicid_to_node[i]; +if (node !=NUMA_NO_NODE &&node_online (node)) +return node; + } +return first_node (node_online_map);/* Shouldn't happen */ +} +#endif /* * On a AMD dual core setup the lower bits of the APIC id distingush the cores.
@@ -196,6 +217,42 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)#endif } +static void __cpuinit srat_detect_node (struct cpuinfo_x86 *c) +{ +#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 ) +int cpu =smp_processor_id (); +int node; +unsigned apicid =hard_smp_processor_id (); + + node = c->phys_proc_id; +if (apicid_to_node[apicid] !=NUMA_NO_NODE ) + node = apicid_to_node[apicid]; +if (!node_online (node)) { +/* Two possibilities here: +- The CPU is missing memory and no node was created. +In that case try picking one from a nearby CPU +- The APIC IDs differ from the HyperTransport node IDs +which the K8 northbridge parsing fills in. +Assume they are all increased by a constant offset, +but in the same order as the HT nodeids. +If that doesn't result in a usable node fall back to the +path for the previous case. */ + +int ht_nodeid = c->initial_apicid; + +if (ht_nodeid >=0 && + apicid_to_node[ht_nodeid] !=NUMA_NO_NODE ) + node = apicid_to_node[ht_nodeid]; +/* Pick a nearby node */ +if (!node_online (node)) + node =nearby_node (apicid); + } +numa_set_node (cpu, node); + +printk (KERN_INFO "CPU %d/%x -> Node %d\n" , cpu, apicid, node); +#endif +} +static void __cpuinit early_init_amd_mc (struct cpuinfo_x86 *c) {#ifdef CONFIG_X86_HT
@@ -226,13 +283,19 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) {early_init_amd_mc (c); +/* c->x86_power is 8000_0007 edx. Bit 8 is constant TSC */ if (c->x86_power & (1 <<8 ))set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC ); +#ifdef CONFIG_X86_64 +set_cpu_cap (c,X86_FEATURE_SYSCALL32 ); +#else /* Set MTRR capability flag if appropriate */ -if (c->x86_model ==13 || c->x86_model ==9 || - (c->x86_model ==8 && c->x86_mask >=8 )) -set_cpu_cap (c,X86_FEATURE_K6_MTRR ); +if (c->x86 ==5 ) +if (c->x86_model ==13 || c->x86_model ==9 || + (c->x86_model ==8 && c->x86_mask >=8 )) +set_cpu_cap (c,X86_FEATURE_K6_MTRR ); +#endif }static void __cpuinit init_amd (struct cpuinfo_x86 *c)
@@ -257,17 +320,30 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)early_init_amd (c);/* -* FIXME: We should handle the K5 here. Set up the write -* range and also turn on MSR 83 bits 4 and 31 (write alloc, -* no bus pipeline) -*/ - -/* * Bit 31 in normal CPUID used for nonstandard 3DNow ID; * 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */ clear_cpu_cap (c,0 *32 +31 ); +#ifdef CONFIG_X86_64 +/* On C+ stepping K8 rep microcode works well for copy/memset */ +if (c->x86 ==0xf ) { +u32 level; + + level =cpuid_eax (1 ); +if ((level >=0x0f48 && level <0x0f50 ) || level >=0x0f58 ) +set_cpu_cap (c,X86_FEATURE_REP_GOOD ); + } +if (c->x86 ==0x10 || c->x86 ==0x11 ) +set_cpu_cap (c,X86_FEATURE_REP_GOOD ); +#else + +/* +* FIXME: We should handle the K5 here. Set up the write +* range and also turn on MSR 83 bits 4 and 31 (write alloc, +* no bus pipeline) +*/ +switch (c->x86) {case 4 :init_amd_k5 (c);
@@ -283,7 +359,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)/* K6s reports MCEs but don't actually have all the MSRs */ if (c->x86 <6 )clear_cpu_cap (c,X86_FEATURE_MCE ); +#endif +/* Enable workaround for FXSAVE leak */ if (c->x86 >=6 )set_cpu_cap (c,X86_FEATURE_FXSAVE_LEAK );
@@ -300,10 +378,14 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)display_cacheinfo (c);/* Multi core CPU? */ -if (c->extended_cpuid_level >=0x80000008 ) +if (c->extended_cpuid_level >=0x80000008 ) {amd_detect_cmp (c); +srat_detect_node (c); + } +#ifdef CONFIG_X86_32 detect_ht (c); +#endif if (c->extended_cpuid_level >=0x80000006 ) {if ((c->x86 >=0x0f ) && (cpuid_edx (0x80000006 ) &0xf000 ))
@@ -319,8 +401,38 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)/* MFENCE stops RDTSC speculation */ set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); } + +#ifdef CONFIG_X86_64 +if (c->x86 ==0x10 ) { +/* do this for boot cpu */ +if (c == &boot_cpu_data) +check_enable_amd_mmconf_dmi (); + +fam10h_check_enable_mmcfg (); + } + +if (c == &boot_cpu_data && c->x86 >=0xf && c->x86 <=0x11 ) { +unsigned long long tseg; + +/* +* Split up direct mapping around the TSEG SMM area. +* Don't do it for gbpages because there seems very little +* benefit in doing so. +*/ +if (!rdmsrl_safe (MSR_K8_TSEG_ADDR , &tseg)) { +printk (KERN_DEBUG "tseg: %010llx\n" , tseg); +if ((tseg>>PMD_SHIFT ) < + (max_low_pfn_mapped>>(PMD_SHIFT -PAGE_SHIFT )) || + ((tseg>>PMD_SHIFT ) < + (max_pfn_mapped>>(PMD_SHIFT -PAGE_SHIFT )) && + (tseg>>PMD_SHIFT ) >= (1ULL <<(32 -PMD_SHIFT )))) +set_memory_4k ((unsigned long )__va (tseg),1 ); + } + } +#endif } +#ifdef CONFIG_X86_32 static unsigned int __cpuinit amd_size_cache (struct cpuinfo_x86 *c,unsigned int size) {/* AMD errata T13 (order #21922) */
@@ -333,10 +445,12 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c, unsigned int }return size; } +#endif static struct cpu_dev amd_cpu_dev__cpuinitdata = { .c_vendor ="AMD" , .c_ident = {"AuthenticAMD" }, +#ifdef CONFIG_X86_32 .c_models = { { .vendor =X86_VENDOR_AMD , .family =4 , .model_names = {
@@ -349,9 +463,10 @@ static struct cpu_dev amd_cpu_dev __cpuinitdata = { } }, }, + .c_size_cache = amd_size_cache, +#endif .c_early_init = early_init_amd, .c_init = init_amd, - .c_size_cache = amd_size_cache, .c_x86_vendor = X86_VENDOR_AMD, };
Signature · 1 line
1.5.4.5
PATCH 6/9 x86: make amd_64 have 32 bit code
In reply to Yinghai Lu--- arch/x86/kernel/cpu/amd_64.c | 259 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 247 insertions(+), 12 deletions(-)
arch/x86/kernel/cpu/amd_64.c +247 -12
@@ -16,7 +16,171 @@#include "cpu.h" -#ifdef CONFIG_NUMA +#ifdef CONFIG_X86_32 +/* +* B step AMD K6 before B 9730xxxx have hardware bugs that can cause +* misexecution of code under Linux. Owners of such processors should +* contact AMD for precise details and a CPU swap. +* +* See http://www.multimania.com/poulot/k6bug.html +* http://www.amd.com/K6/k6docs/revgd.html +* +* The following test is erm.. interesting. AMD neglected to up +* the chip setting when fixing the bug but they also tweaked some +* performance at the same time.. +*/ + +extern void vide (void ); +__asm__(".align 4\nvide: ret" ); + +static void __cpuinit init_amd_k5 (struct cpuinfo_x86 *c) +{ +/* +* General Systems BIOSen alias the cpu frequency registers +* of the Elan at 0x000df000. Unfortuantly, one of the Linux +* drivers subsequently pokes it, and changes the CPU speed. +* Workaround : Remove the unneeded alias. +*/ +#define CBAR (0xfffc)/* Configuration Base Address (32-bit) */ +#define CBAR_ENB (0x80000000) +#define CBAR_KEY (0X000000CB) +if (c->x86_model ==9 || c->x86_model ==10 ) { +if (inl (CBAR ) &CBAR_ENB ) +outl (0 |CBAR_KEY ,CBAR ); + } +} + + +static void __cpuinit init_amd_k6 (struct cpuinfo_x86 *c) +{ +u32 l, h; +int mbytes = num_physpages >> (20 -PAGE_SHIFT ); + +if (c->x86_model <6 ) { +/* Based on AMD doc 20734R - June 2000 */ +if (c->x86_model ==0 ) { +clear_cpu_cap (c,X86_FEATURE_APIC ); +set_cpu_cap (c,X86_FEATURE_PGE ); + } +return ; + } + +if (c->x86_model ==6 && c->x86_mask ==1 ) { +const int K6_BUG_LOOP =1000000 ; +int n; +void (*f_vide)(void ); +unsigned long d, d2; + +printk (KERN_INFO "AMD K6 stepping B detected - " ); + +/* +* It looks like AMD fixed the 2.6.2 bug and improved indirect +* calls at the same time. +*/ + + n =K6_BUG_LOOP ; + f_vide = vide; +rdtscl (d); +while (n--) +f_vide (); +rdtscl (d2); + d = d2-d; + +if (d >20 *K6_BUG_LOOP ) +printk ("system stability may be impaired when more than 32 MB are used.\n" ); +else +printk ("probably OK (after B9730xxxx).\n" ); +printk (KERN_INFO "Please see http://membres.lycos.fr/poulot/k6bug.html\n" ); + } + +/* K6 with old style WHCR */ +if (c->x86_model <8 || + (c->x86_model ==8 && c->x86_mask <8 )) { +/* We can only write allocate on the low 508Mb */ +if (mbytes >508 ) + mbytes =508 ; + +rdmsr (MSR_K6_WHCR , l, h); +if ((l&0x0000FFFF ) ==0 ) { +unsigned long flags; + l = (1 <<0 )|((mbytes/4 )<<1 ); +local_irq_save (flags); +wbinvd (); +wrmsr (MSR_K6_WHCR , l, h); +local_irq_restore (flags); +printk (KERN_INFO "Enabling old style K6 write allocation for %d Mb\n" , + mbytes); + } +return ; + } + +if ((c->x86_model ==8 && c->x86_mask >7 ) || + c->x86_model ==9 || c->x86_model ==13 ) { +/* The more serious chips .. */ + +if (mbytes >4092 ) + mbytes =4092 ; + +rdmsr (MSR_K6_WHCR , l, h); +if ((l&0xFFFF0000 ) ==0 ) { +unsigned long flags; + l = ((mbytes>>2 )<<22 )|(1 <<16 ); +local_irq_save (flags); +wbinvd (); +wrmsr (MSR_K6_WHCR , l, h); +local_irq_restore (flags); +printk (KERN_INFO "Enabling new style K6 write allocation for %d Mb\n" , + mbytes); + } + +return ; + } + +if (c->x86_model ==10 ) { +/* AMD Geode LX is model 10 */ +/* placeholder for any needed mods */ +return ; + } +} + +static void __cpuinit init_amd_k7 (struct cpuinfo_x86 *c) +{ +u32 l, h; + +/* +* Bit 15 of Athlon specific MSR 15, needs to be 0 +* to enable SSE on Palomino/Morgan/Barton CPU's. +* If the BIOS didn't enable it already, enable it here. +*/ +if (c->x86_model >=6 && c->x86_model <=10 ) { +if (!cpu_has (c,X86_FEATURE_XMM )) { +printk (KERN_INFO "Enabling disabled K7/SSE Support.\n" ); +rdmsr (MSR_K7_HWCR , l, h); + l &= ~0x00008000 ; +wrmsr (MSR_K7_HWCR , l, h); +set_cpu_cap (c,X86_FEATURE_XMM ); + } + } + +/* +* It's been determined by AMD that Athlons since model 8 stepping 1 +* are more robust with CLK_CTL set to 200xxxxx instead of 600xxxxx +* As per AMD technical note 27212 0.2 +*/ +if ((c->x86_model ==8 && c->x86_mask >=1 ) || (c->x86_model >8 )) { +rdmsr (MSR_K7_CLK_CTL , l, h); +if ((l &0xfff00000 ) !=0x20000000 ) { +printk ("CPU: CLK_CTL MSR was %x. Reprogramming to %x\n" , l, + ((l &0x000fffff )|0x20000000 )); +wrmsr (MSR_K7_CLK_CTL , (l &0x000fffff )|0x20000000 , h); + } + } + +set_cpu_cap (c,X86_FEATURE_K7 ); +} +#endif + +#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 )static int __cpuinit nearby_node (int apicid) {int i, node;
@@ -41,7 +205,7 @@ static int __cpuinit nearby_node(int apicid)*/ static void __cpuinit amd_detect_cmp (struct cpuinfo_x86 *c) { -#ifdef CONFIG_SMP +#ifdef CONFIG_X86_HT unsigned bits; bits = c->x86_coreid_bits;
@@ -55,7 +219,7 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)static void __cpuinit srat_detect_node (struct cpuinfo_x86 *c) { -#ifdef CONFIG_NUMA +#if defined(CONFIG_NUMA ) && defined(CONFIG_X86_64 )int cpu =smp_processor_id ();int node;unsigned apicid =hard_smp_processor_id ();
@@ -91,7 +255,7 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c)static void __cpuinit early_init_amd_mc (struct cpuinfo_x86 *c) { -#ifdef CONFIG_SMP +#ifdef CONFIG_X86_HT unsigned bits, ecx;/* Multi core CPU? */
@@ -112,7 +276,6 @@ static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c) } c->x86_coreid_bits = bits; -#endif }
@@ -124,15 +287,21 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)if (c->x86_power & (1 <<8 ))set_cpu_cap (c,X86_FEATURE_CONSTANT_TSC ); +#ifdef CONFIG_X86_64 set_cpu_cap (c,X86_FEATURE_SYSCALL32 ); +#else +/* Set MTRR capability flag if appropriate */ +if (c->x86 ==5 ) +if (c->x86_model ==13 || c->x86_model ==9 || + (c->x86_model ==8 && c->x86_mask >=8 )) +set_cpu_cap (c,X86_FEATURE_K6_MTRR ); +#endif }static void __cpuinit init_amd (struct cpuinfo_x86 *c) { -unsigned level; -#ifdef CONFIG_SMP -unsigned long value; +unsigned long long value;/* * Disable TLB flush filter by setting HWCR.FFDIS on K8
@@ -142,26 +311,55 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)* Errata 122 for all steppings (F+ have it disabled by default) */ if (c->x86 ==0xf ) { -rdmsrl (MSR_K8_HWCR , value); +rdmsrl (MSR_K7_HWCR , value); value |=1 <<6 ; -wrmsrl (MSR_K8_HWCR , value); +wrmsrl (MSR_K7_HWCR , value); }#endif early_init_amd (c); -/* Bit 31 in normal CPUID used for nonstandard 3DNow ID; -3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */ +/* +* Bit 31 in normal CPUID used for nonstandard 3DNow ID; +* 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway +*/ clear_cpu_cap (c,0 *32 +31 ); +#ifdef CONFIG_X86_64 /* On C+ stepping K8 rep microcode works well for copy/memset */ if (c->x86 ==0xf ) { +u32 level; + level =cpuid_eax (1 );if ((level >=0x0f48 && level <0x0f50 ) || level >=0x0f58 )set_cpu_cap (c,X86_FEATURE_REP_GOOD ); }if (c->x86 ==0x10 || c->x86 ==0x11 )set_cpu_cap (c,X86_FEATURE_REP_GOOD ); +#else + +/* +* FIXME: We should handle the K5 here. Set up the write +* range and also turn on MSR 83 bits 4 and 31 (write alloc, +* no bus pipeline) +*/ + +switch (c->x86) { +case 4 : +init_amd_k5 (c); +break ; +case 5 : +init_amd_k6 (c); +break ; +case 6 :/* An Athlon/Duron */ +init_amd_k7 (c); +break ; + } + +/* K6s reports MCEs but don't actually have all the MSRs */ +if (c->x86 <6 ) +clear_cpu_cap (c,X86_FEATURE_MCE ); +#endif /* Enable workaround for FXSAVE leak */ if (c->x86 >=6 )
@@ -176,6 +374,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)break ; } } +display_cacheinfo (c);/* Multi core CPU? */
@@ -184,6 +383,10 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)srat_detect_node (c); } +#ifdef CONFIG_X86_32 +detect_ht (c); +#endif +if (c->extended_cpuid_level >=0x80000006 ) {if ((c->x86 >=0x0f ) && (cpuid_edx (0x80000006 ) &0xf000 )) num_cache_leaves =4 ;
@@ -199,6 +402,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); } +#ifdef CONFIG_X86_64 if (c->x86 ==0x10 ) {/* do this for boot cpu */ if (c == &boot_cpu_data)
@@ -225,11 +429,42 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) set_memory_4k((unsigned long)__va(tseg), 1); } } +#endif +} + +#ifdef CONFIG_X86_32 +static unsigned int __cpuinit amd_size_cache (struct cpuinfo_x86 *c,unsigned int size) +{ +/* AMD errata T13 (order #21922) */ +if ((c->x86 ==6 )) { +if (c->x86_model ==3 && c->x86_mask ==0 )/* Duron Rev A0 */ + size =64 ; +if (c->x86_model ==4 && + (c->x86_mask ==0 || c->x86_mask ==1 ))/* Tbird rev A1/A2 */ + size =256 ; + } +return size; } +#endif static struct cpu_dev amd_cpu_dev__cpuinitdata = { .c_vendor ="AMD" , .c_ident = {"AuthenticAMD" }, +#ifdef CONFIG_X86_32 + .c_models = { + { .vendor =X86_VENDOR_AMD , .family =4 , .model_names = + { + [3 ] ="486 DX/2" , + [7 ] ="486 DX/2-WB" , + [8 ] ="486 DX/4" , + [9 ] ="486 DX/4-WB" , + [14 ] ="Am5x86-WT" , + [15 ] ="Am5x86-WB" + } + }, + }, + .c_size_cache = amd_size_cache, +#endif .c_early_init = early_init_amd, .c_init = init_amd, .c_x86_vendor =X86_VENDOR_AMD ,
Signature · 1 line
1.5.4.5
PATCH 7/9 x86: make 64 bit to use amd.c
In reply to Yinghai Lu--- arch/x86/Kconfig.cpu | 10 +- arch/x86/kernel/cpu/Makefile | 3 +- arch/x86/kernel/cpu/amd_64.c | 473 ------------------------------------------ 3 files changed, 2 insertions(+), 484 deletions(-) delete mode 100644 arch/x86/kernel/cpu/amd_64.c
arch/x86/Kconfig.cpu +1 -9
@@ -462,17 +462,9 @@ config CPU_SUP_CYRIX_32 help This enables extended support for Cyrix processors -config CPU_SUP_AMD_32 +config CPU_SUP_AMD default y bool "Support AMD processors" if PROCESSOR_SELECT - depends on !64BIT - help - This enables extended support for AMD processors - -config CPU_SUP_AMD_64 - default y - bool "Support AMD processors" if PROCESSOR_SELECT - depends on 64BIT help This enables extended support for AMD processors
arch/x86/kernel/cpu/Makefile +1 -2
@@ -10,8 +10,7 @@ obj-$(CONFIG_X86_64) += bugs_64.o obj-$(CONFIG_CPU_SUP_INTEL_32) += intel.o obj-$(CONFIG_CPU_SUP_INTEL_64) += intel_64.o -obj-$(CONFIG_CPU_SUP_AMD_32) += amd.o -obj-$(CONFIG_CPU_SUP_AMD_64) += amd_64.o +obj-$(CONFIG_CPU_SUP_AMD) += amd.o obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o obj-$(CONFIG_CPU_SUP_CENTAUR_32) += centaur.o obj-$(CONFIG_CPU_SUP_CENTAUR_64) += centaur_64.o
arch/x86/kernel/cpu/amd_64.c deleted +0 -473
473 lines not on this page · raw message
Signature · 1 line
1.5.4.5
Re: [PATCH 7/9] x86: make 64 bit to use amd.c
Quoted 7 lines · Yinghai Lu
Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/Kconfig.cpu | 10 +- arch/x86/kernel/cpu/Makefile | 3 +- arch/x86/kernel/cpu/amd_64.c | 473 ------------------------------------------ 3 files changed, 2 insertions(+), 484 deletions(-) delete mode 100644 arch/x86/kernel/cpu/amd_64.c
nice! Applied these patches to tip/x86/unify-cpu-detect:
ff73152: x86: make 64 bit to use amd.c 2a02505: x86: make amd_64 have 32 bit code 6c62aa4: x86: make amd.c have 64bit support code 8d71a2e: x86: merge header in amd_64.c 2b86473: x86: add srat_detect_node for amd64
c58606a: x86: remove duplicated force_mwait 11fdd25: x86: cpu make amd.c more like amd_64.c v2
thanks Yinghai,
Ingo
PATCH 8/9 x86: lapic address print out like io apic addr
In reply to Yinghai Lu--- arch/x86/kernel/apic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/apic.c +1 -1
@@ -1548,7 +1548,7 @@ void __init init_apic_mappings(void) apic_phys = mp_lapic_addr;set_fixmap_nocache (FIX_APIC_BASE , apic_phys); -apic_printk (APIC_VERBOSE ,"mapped APIC to %16lx (%16lx)\n" , +apic_printk (APIC_VERBOSE ,"mapped APIC to %08lx (%08lx)\n" ,APIC_BASE , apic_phys);/*
Signature · 1 line
1.5.4.5
Ingo Molnar
AppliedRe: [PATCH 8/9] x86: lapic address print out like io apic addr
Quoted 4 lines · Yinghai Lu
Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/kernel/apic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
applied to tip/irq/sparseirq - thanks Yinghai!
Ingo
PATCH 9/9 x86: little clean up intel.c/intel_64.c
In reply to Yinghai Lu--- arch/x86/kernel/cpu/intel.c | 7 +++---- arch/x86/kernel/cpu/intel_64.c | 8 +++----- 2 files changed, 6 insertions(+), 9 deletions(-)
arch/x86/kernel/cpu/intel.c +3 -4
@@ -76,7 +76,7 @@ static void __cpuinit Intel_errata_workarounds(struct cpuinfo_x86 *c)/* * find out the number of processor cores on the die */ -static int __cpuinit num_cpu_cores (struct cpuinfo_x86 *c) +static int __cpuinit intel_num_cpu_cores (struct cpuinfo_x86 *c) {unsigned int eax, ebx, ecx, edx;
@@ -183,7 +183,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)* let's use the legacy cpuid vector 0x1 and 0x4 for topology * detection. */ - c->x86_max_cores =num_cpu_cores (c); + c->x86_max_cores =intel_num_cpu_cores (c);detect_ht (c); }
@@ -210,9 +210,8 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)if (cpu_has_xmm2)set_cpu_cap (c,X86_FEATURE_LFENCE_RDTSC ); -if (c->x86 ==15 ) { +if (c->x86 ==15 )set_cpu_cap (c,X86_FEATURE_P4 ); - }if (c->x86 ==6 )set_cpu_cap (c,X86_FEATURE_P3 );if (cpu_has_ds) {
arch/x86/kernel/cpu/intel_64.c +3 -5
@@ -71,17 +71,15 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_BTS );if (!(l1 & (1 <<12 )))set_cpu_cap (c,X86_FEATURE_PEBS ); - } - - -if (cpu_has_bts)ds_init_intel (c); + }if (c->x86 ==15 ) c->x86_cache_alignment = c->x86_clflush_size *2 ;if (c->x86 ==6 )set_cpu_cap (c,X86_FEATURE_REP_GOOD ); -set_cpu_cap (c,X86_FEATURE_LFENCE_RDTSC ); +if (cpu_has_xmm2) +set_cpu_cap (c,X86_FEATURE_LFENCE_RDTSC );detect_extended_topology (c);if (!cpu_has (c,X86_FEATURE_XTOPOLOGY ))
Signature · 1 line
1.5.4.5
Ingo Molnar
AppliedRe: [PATCH 9/9] x86: little clean up intel.c/intel_64.c
Quoted 5 lines · Yinghai Lu
Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/kernel/cpu/intel.c | 7 +++---- arch/x86/kernel/cpu/intel_64.c | 8 +++----- 2 files changed, 6 insertions(+), 9 deletions(-)
applied to tip/x86/unify-cpu-detect, thanks.
Ingo