x86: remove smp_apply_quirks()/smp_checks()
PATCH 1/1 x86: remove smp_apply_quirks()/smp_checks()
Impact: cleanup to make 64 bit don't compile those related code
those code is only applied to intel pentium and amd k7 32 bit cpus. move those check to intel_init()/amd_init() for 32bit
so 64 bit will not include those code
also change to use cpu_index check to see if need emit warning.
--- arch/x86/kernel/cpu/amd.c | 52 +++++++++++++++++++++++++++++ arch/x86/kernel/cpu/intel.c | 25 ++++++++++++++ arch/x86/kernel/smpboot.c | 78 -------------------------------------------- 3 files changed, 77 insertions(+), 78 deletions(-)
arch/x86/kernel/cpu/amd.c +52 -0
@@ -5,6 +5,7 @@#include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> +#include <asm/cpu.h> #ifdef CONFIG_X86_64 # include <asm/numa_64.h>
@@ -141,6 +142,55 @@ static void __cpuinit init_amd_k6(struct } } +static void __cpuinit amd_k7_smp_check (struct cpuinfo_x86 *c) +{ +#ifdef CONFIG_SMP +/* calling is from identify_secondary_cpu() ? */ +if (c->cpu_index == boot_cpu_id) +return ; + +/* +* Certain Athlons might work (for various values of 'work') in SMP +* but they are not certified as MP capable. +*/ +/* Athlon 660/661 is valid. */ +if ((c->x86_model ==6 ) && ((c->x86_mask ==0 ) || + (c->x86_mask ==1 ))) + goto valid_k7; + +/* Duron 670 is valid */ +if ((c->x86_model ==7 ) && (c->x86_mask ==0 )) + goto valid_k7; + +/* +* Athlon 662, Duron 671, and Athlon >model 7 have capability +* bit. It's worth noting that the A5 stepping (662) of some +* Athlon XP's have the MP bit set. +* See http://www.heise.de/newsticker/data/jow-18.10.01-000 for +* more. +*/ +if (((c->x86_model ==6 ) && (c->x86_mask >=2 )) || + ((c->x86_model ==7 ) && (c->x86_mask >=1 )) || + (c->x86_model >7 )) +if (cpu_has_mp) + goto valid_k7; + +/* If we get here, not a certified SMP capable AMD system. */ + +/* +* Don't taint if we are running SMP kernel on a single non-MP +* approved Athlon +*/ +WARN_ONCE (1 ,"WARNING: This combination of AMD" +"processors is not suitable for SMP.\n" ); +if (!test_taint (TAINT_UNSAFE_SMP )) +add_taint (TAINT_UNSAFE_SMP ); + +valid_k7: + ; +#endif +} +static void __cpuinit init_amd_k7 (struct cpuinfo_x86 *c) {u32 l, h;
@@ -175,6 +225,8 @@ static void __cpuinit init_amd_k7(struct }set_cpu_cap (c,X86_FEATURE_K7 ); + +amd_k7_smp_check (c); }#endif
arch/x86/kernel/cpu/intel.c +25 -0
@@ -14,6 +14,7 @@#include <asm/uaccess.h> #include <asm/ds.h> #include <asm/bugs.h> +#include <asm/cpu.h> #ifdef CONFIG_X86_64 #include <asm/topology.h>
@@ -139,6 +140,28 @@ static void __cpuinit trap_init_f00f_bug }#endif +static void __cpuinit intel_smp_check (struct cpuinfo_x86 *c) +{ +#ifdef CONFIG_SMP +/* calling is from identify_secondary_cpu() ? */ +if (c->cpu_index == boot_cpu_id) +return ; + +/* +* Mask B, Pentium, but not Pentium MMX +*/ +if (c->x86 ==5 && + c->x86_mask >=1 && c->x86_mask <=4 && + c->x86_model <=3 ) { +/* +* Remember we have B step Pentia with bugs +*/ +WARN_ONCE (1 ,"WARNING: SMP operation may be unreliable" +"with B stepping processors.\n" ); + } +#endif +} +static void __cpuinit intel_workarounds (struct cpuinfo_x86 *c) {unsigned long lo, hi;
@@ -215,6 +238,8 @@ static void __cpuinit intel_workarounds(#ifdef CONFIG_X86_NUMAQ numaq_tsc_disable ();#endif + + intel_smp_check(c); }#else static void __cpuinit intel_workarounds (struct cpuinfo_x86 *c)
arch/x86/kernel/smpboot.c +0 -78
108 lines not on this page · raw message
Commit-ID: 1f442d70c84aa798e243e721eba728a98434cd86 Gitweb: http://git.kernel.org/tip/1f442d70c84aa798e243e721eba728a98434cd86 Author: "Yinghai Lu" <[email protected]> AuthorDate: Sat, 7 Mar 2009 23:46:26 -0800 Commit: Ingo Molnar <[email protected]> CommitDate: Sun, 8 Mar 2009 16:22:56 +0100
x86: remove smp_apply_quirks()/smp_checks()
Impact: cleanup and code size reduction on 64-bit
This code is only applied to Intel Pentium and AMD K7 32-bit cpus.
Move those checks to intel_init()/amd_init() for 32-bit so 64-bit will not build this code.
Also change to use cpu_index check to see if we need to emit warning.
LKML-Reference: <[email protected]>
--- arch/x86/kernel/cpu/amd.c | 52 ++++++++++++++++++++++++++++ arch/x86/kernel/cpu/intel.c | 25 ++++++++++++++ arch/x86/kernel/smpboot.c | 78 ------------------------------------------- 3 files changed, 77 insertions(+), 78 deletions(-)
arch/x86/kernel/cpu/amd.c +52 -0
@@ -5,6 +5,7 @@#include <asm/io.h> #include <asm/processor.h> #include <asm/apic.h> +#include <asm/cpu.h> #ifdef CONFIG_X86_64 # include <asm/numa_64.h>
@@ -141,6 +142,55 @@ static void __cpuinit init_amd_k6(struct cpuinfo_x86 *c) } } +static void __cpuinit amd_k7_smp_check (struct cpuinfo_x86 *c) +{ +#ifdef CONFIG_SMP +/* calling is from identify_secondary_cpu() ? */ +if (c->cpu_index == boot_cpu_id) +return ; + +/* +* Certain Athlons might work (for various values of 'work') in SMP +* but they are not certified as MP capable. +*/ +/* Athlon 660/661 is valid. */ +if ((c->x86_model ==6 ) && ((c->x86_mask ==0 ) || + (c->x86_mask ==1 ))) + goto valid_k7; + +/* Duron 670 is valid */ +if ((c->x86_model ==7 ) && (c->x86_mask ==0 )) + goto valid_k7; + +/* +* Athlon 662, Duron 671, and Athlon >model 7 have capability +* bit. It's worth noting that the A5 stepping (662) of some +* Athlon XP's have the MP bit set. +* See http://www.heise.de/newsticker/data/jow-18.10.01-000 for +* more. +*/ +if (((c->x86_model ==6 ) && (c->x86_mask >=2 )) || + ((c->x86_model ==7 ) && (c->x86_mask >=1 )) || + (c->x86_model >7 )) +if (cpu_has_mp) + goto valid_k7; + +/* If we get here, not a certified SMP capable AMD system. */ + +/* +* Don't taint if we are running SMP kernel on a single non-MP +* approved Athlon +*/ +WARN_ONCE (1 ,"WARNING: This combination of AMD" +"processors is not suitable for SMP.\n" ); +if (!test_taint (TAINT_UNSAFE_SMP )) +add_taint (TAINT_UNSAFE_SMP ); + +valid_k7: + ; +#endif +} +static void __cpuinit init_amd_k7 (struct cpuinfo_x86 *c) {u32 l, h;
@@ -175,6 +225,8 @@ static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c) }set_cpu_cap (c,X86_FEATURE_K7 ); + +amd_k7_smp_check (c); }#endif
arch/x86/kernel/cpu/intel.c +25 -0
@@ -13,6 +13,7 @@#include <asm/uaccess.h> #include <asm/ds.h> #include <asm/bugs.h> +#include <asm/cpu.h> #ifdef CONFIG_X86_64 #include <asm/topology.h>
@@ -110,6 +111,28 @@ static void __cpuinit trap_init_f00f_bug(void) }#endif +static void __cpuinit intel_smp_check (struct cpuinfo_x86 *c) +{ +#ifdef CONFIG_SMP +/* calling is from identify_secondary_cpu() ? */ +if (c->cpu_index == boot_cpu_id) +return ; + +/* +* Mask B, Pentium, but not Pentium MMX +*/ +if (c->x86 ==5 && + c->x86_mask >=1 && c->x86_mask <=4 && + c->x86_model <=3 ) { +/* +* Remember we have B step Pentia with bugs +*/ +WARN_ONCE (1 ,"WARNING: SMP operation may be unreliable" +"with B stepping processors.\n" ); + } +#endif +} +static void __cpuinit intel_workarounds (struct cpuinfo_x86 *c) {unsigned long lo, hi;
@@ -186,6 +209,8 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)#ifdef CONFIG_X86_NUMAQ numaq_tsc_disable ();#endif + + intel_smp_check(c); }#else static void __cpuinit intel_workarounds (struct cpuinfo_x86 *c)
arch/x86/kernel/smpboot.c +0 -78
108 lines not on this page · raw message