x86 amd: Revert 6382:b74c15e4dd4f (AMD flush filter configuration)

Flush filter is not reliably supported by any processor, we already
have code to unconditionally disable the filter, so we don't need the
command-line config option. Remove it.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index c9187b43080776329af7e833ec6feaf54403ecb3..e2cded6a389ae3325c9938aac64293eef94a4cd1 100644 (file)
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -230,25 +230,6 @@ int cpu_has_amd_erratum(const struct cpuinfo_x86 *cpu, int osvw, ...)
        return 0;
 }
 
-/*
- * amd_flush_filter={on,off}. Forcibly Enable or disable the TLB flush
- * filter on AMD 64-bit processors.
- */
-static s8 __devinit flush_filter_force;
-static void __init flush_filter(char *s)
-{
-       switch (parse_bool(s))
-       {
-       case 0:
-               flush_filter_force = -1;
-               break;
-       case 1:
-               flush_filter_force = 1;
-               break;
-       }
-}
-custom_param("amd_flush_filter", flush_filter);
-
 #define num_physpages 0
 
 /*
@@ -543,21 +524,6 @@ static void __devinit init_amd(struct cpuinfo_x86 *c)
                break;
        }
 
-       if (c->x86 == 15) {
-               rdmsr(MSR_K7_HWCR, l, h);
-               printk(KERN_INFO "CPU%d: AMD Flush Filter %sabled",
-                      smp_processor_id(), (l & (1<<6)) ? "dis" : "en");
-               if ((flush_filter_force > 0) && (l & (1<<6))) {
-                       l &= ~(1<<6);
-                       printk(" -> Forcibly enabled");
-               } else if ((flush_filter_force < 0) && !(l & (1<<6))) {
-                       l |= 1<<6;
-                       printk(" -> Forcibly disabled");
-               }
-               wrmsr(MSR_K7_HWCR, l, h);
-               printk("\n");
-       }
-
        display_cacheinfo(c);
 
        if (cpuid_eax(0x80000000) >= 0x80000008) {