diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:26:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:26:51 -0400 |
commit | 5f78e4d33945b291d12765cdd7e4304f437b9361 (patch) | |
tree | 113cea729de15a98bb941cc4afb8d13301534ca7 /arch/x86/kernel/setup_64.c | |
parent | 867a89e0b73af48838c7987e80899a1ff26dd6ff (diff) | |
parent | 5f0b2976cb2b62668a076f54419c24b8ab677167 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci:
x86: add pci=check_enable_amd_mmconf and dmi check
x86: work around io allocation overlap of HT links
acpi: get boot_cpu_id as early for k8_scan_nodes
x86_64: don't need set default res if only have one root bus
x86: double check the multi root bus with fam10h mmconf
x86: multi pci root bus with different io resource range, on 64-bit
x86: use bus conf in NB conf fun1 to get bus range on, on 64-bit
x86: get mp_bus_to_node early
x86 pci: remove checking type for mmconfig probe
x86: remove unneeded check in mmconf reject
driver core: try parent numa_node at first before using default
x86: seperate mmconf for fam10h out from setup_64.c
x86: if acpi=off, force setting the mmconf for fam10h
x86_64: check MSR to get MMCONFIG for AMD Family 10h
x86_64: check and enable MMCONFIG for AMD Family 10h
x86_64: set cfg_size for AMD Family 10h in case MMCONFIG
x86: mmconf enable mcfg early
x86: clear pci_mmcfg_virt when mmcfg get rejected
x86: validate against acpi motherboard resources
Fixed up fairly trivial conflicts in arch/x86/pci/{init.c,pci.h} due to
OLPC support manually.
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
-rw-r--r-- | arch/x86/kernel/setup_64.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index a94fb959a87a..22c14e21c97c 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/crash_dump.h> | 29 | #include <linux/crash_dump.h> |
30 | #include <linux/root_dev.h> | 30 | #include <linux/root_dev.h> |
31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
32 | #include <asm/pci-direct.h> | ||
32 | #include <linux/efi.h> | 33 | #include <linux/efi.h> |
33 | #include <linux/acpi.h> | 34 | #include <linux/acpi.h> |
34 | #include <linux/kallsyms.h> | 35 | #include <linux/kallsyms.h> |
@@ -40,6 +41,7 @@ | |||
40 | #include <linux/dmi.h> | 41 | #include <linux/dmi.h> |
41 | #include <linux/dma-mapping.h> | 42 | #include <linux/dma-mapping.h> |
42 | #include <linux/ctype.h> | 43 | #include <linux/ctype.h> |
44 | #include <linux/sort.h> | ||
43 | #include <linux/uaccess.h> | 45 | #include <linux/uaccess.h> |
44 | #include <linux/init_ohci1394_dma.h> | 46 | #include <linux/init_ohci1394_dma.h> |
45 | #include <linux/kvm_para.h> | 47 | #include <linux/kvm_para.h> |
@@ -288,6 +290,18 @@ static void __init parse_setup_data(void) | |||
288 | } | 290 | } |
289 | } | 291 | } |
290 | 292 | ||
293 | #ifdef CONFIG_PCI_MMCONFIG | ||
294 | extern void __cpuinit fam10h_check_enable_mmcfg(void); | ||
295 | extern void __init check_enable_amd_mmconf_dmi(void); | ||
296 | #else | ||
297 | void __cpuinit fam10h_check_enable_mmcfg(void) | ||
298 | { | ||
299 | } | ||
300 | void __init check_enable_amd_mmconf_dmi(void) | ||
301 | { | ||
302 | } | ||
303 | #endif | ||
304 | |||
291 | /* | 305 | /* |
292 | * setup_arch - architecture-specific boot-time initializations | 306 | * setup_arch - architecture-specific boot-time initializations |
293 | * | 307 | * |
@@ -515,6 +529,9 @@ void __init setup_arch(char **cmdline_p) | |||
515 | conswitchp = &dummy_con; | 529 | conswitchp = &dummy_con; |
516 | #endif | 530 | #endif |
517 | #endif | 531 | #endif |
532 | |||
533 | /* do this before identify_cpu for boot cpu */ | ||
534 | check_enable_amd_mmconf_dmi(); | ||
518 | } | 535 | } |
519 | 536 | ||
520 | static int __cpuinit get_model_name(struct cpuinfo_x86 *c) | 537 | static int __cpuinit get_model_name(struct cpuinfo_x86 *c) |
@@ -767,6 +784,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) | |||
767 | /* MFENCE stops RDTSC speculation */ | 784 | /* MFENCE stops RDTSC speculation */ |
768 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); | 785 | set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC); |
769 | 786 | ||
787 | if (c->x86 == 0x10) | ||
788 | fam10h_check_enable_mmcfg(); | ||
789 | |||
770 | if (amd_apic_timer_broken()) | 790 | if (amd_apic_timer_broken()) |
771 | disable_apic_timer = 1; | 791 | disable_apic_timer = 1; |
772 | 792 | ||