1 files changed, 15 insertions, 0 deletions

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 351d8d64c2fb..238f73e1a834 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -831,11 +831,26 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 #endif
 }
 
+#define HWCR 0xc0010015
+
 static int __init init_amd(struct cpuinfo_x86 *c)
 {
         int r;
         int level;
 
+#ifdef CONFIG_SMP
+        unsigned long value;
+
+        // Disable TLB flush filter by setting HWCR.FFDIS:
+        // bit 6 of msr C001_0015
+        //
+        // Errata 63 for SH-B3 steppings
+        // Errata 122 for all(?) steppings
+        rdmsrl(HWCR, value);
+        value |= 1 << 6;
+        wrmsrl(HWCR, value);
+#endif
+
         /* Bit 31 in normal CPUID used for nonstandard 3DNow ID;
            3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway */
         clear_bit(0*32+31, &c->x86_capability);