Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6.git] / arch / x86 / kernel / setup_64.c

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index a94fb959a87a3f35c0eec00bdf696b195b378d30..22c14e21c97c435a8d172d8f23159738bf0dbe2f 100644 (file)
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -29,6 +29,7 @@
 #include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/pci.h>
 #include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/pci.h>

+#include <asm/pci-direct.h>

 #include <linux/efi.h>
 #include <linux/acpi.h>
 #include <linux/kallsyms.h>
 #include <linux/efi.h>
 #include <linux/acpi.h>
 #include <linux/kallsyms.h>


@@ -40,6 +41,7 @@
 #include <linux/dmi.h>
 #include <linux/dma-mapping.h>
 #include <linux/ctype.h>
 #include <linux/dmi.h>
 #include <linux/dma-mapping.h>
 #include <linux/ctype.h>

+#include <linux/sort.h>

 #include <linux/uaccess.h>
 #include <linux/init_ohci1394_dma.h>
 #include <linux/kvm_para.h>
 #include <linux/uaccess.h>
 #include <linux/init_ohci1394_dma.h>
 #include <linux/kvm_para.h>


@@ -288,6 +290,18 @@ static void __init parse_setup_data(void)
        }
 }
 
        }
 }
 

+#ifdef CONFIG_PCI_MMCONFIG
+extern void __cpuinit fam10h_check_enable_mmcfg(void);
+extern void __init check_enable_amd_mmconf_dmi(void);
+#else
+void __cpuinit fam10h_check_enable_mmcfg(void)
+{
+}
+void __init check_enable_amd_mmconf_dmi(void)
+{
+}
+#endif
+

 /*
  * setup_arch - architecture-specific boot-time initializations
  *
 /*
  * setup_arch - architecture-specific boot-time initializations
  *


@@ -515,6 +529,9 @@ void __init setup_arch(char **cmdline_p)
        conswitchp = &dummy_con;
 #endif
 #endif
        conswitchp = &dummy_con;
 #endif
 #endif

+
+       /* do this before identify_cpu for boot cpu */
+       check_enable_amd_mmconf_dmi();

 }
 
 static int __cpuinit get_model_name(struct cpuinfo_x86 *c)
 }
 
 static int __cpuinit get_model_name(struct cpuinfo_x86 *c)


@@ -767,6 +784,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
        /* MFENCE stops RDTSC speculation */
        set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC);
 
        /* MFENCE stops RDTSC speculation */
        set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC);
 

+       if (c->x86 == 0x10)
+               fam10h_check_enable_mmcfg();
+

        if (amd_apic_timer_broken())
                disable_apic_timer = 1;
 
        if (amd_apic_timer_broken())
                disable_apic_timer = 1;