x86, CPU, AMD: Move K8 TLB flush filter workaround to K8 code
Borislav Petkov
maintainerPATCH 1/1 x86, CPU, AMD: Move K8 TLB flush filter workaround to K8 code
From: Borislav Petkov <[email protected]>
This belongs with the rest of the code in init_amd_k8() which gets executed on family 0xf.
Signed-off-by Borislav Petkov <[email protected]>
--- arch/x86/kernel/cpu/amd.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
arch/x86/kernel/cpu/amd.c +11 -12
@@ -559,6 +559,17 @@ static void init_amd_k8(struct cpuinfo_x86 *c)if (!c->x86_model_id[0 ])strcpy (c->x86_model_id,"Hammer" ); + +#ifdef CONFIG_SMP +/* +* Disable TLB flush filter by setting HWCR.FFDIS on K8 +* bit 6 of msr C001_0015 +* +* Errata 63 for SH-B3 steppings +* Errata 122 for all steppings (F+ have it disabled by default) +*/ +msr_set_bit (MSR_K7_HWCR ,6 ); +#endif }static void init_amd_gh (struct cpuinfo_x86 *c)
@@ -629,18 +640,6 @@ static void init_amd(struct cpuinfo_x86 *c) {u32 dummy; -#ifdef CONFIG_SMP -/* -* Disable TLB flush filter by setting HWCR.FFDIS on K8 -* bit 6 of msr C001_0015 -* -* Errata 63 for SH-B3 steppings -* Errata 122 for all steppings (F+ have it disabled by default) -*/ -if (c->x86 ==0xf ) -msr_set_bit (MSR_K7_HWCR ,6 ); -#endif -early_init_amd (c);/*
Signature · 1 line
2.0.0