diff options
author | Feng Tang <feng.tang@intel.com> | 2009-08-14 15:37:50 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-08-28 19:57:34 -0400 |
commit | 5f0db7a2fb78895a197f64e548333b3bbd433996 (patch) | |
tree | f567926a5c29626553b3b8918eaa4c57502c0bce /arch/x86 | |
parent | efafc8b213e67ed148a5b53ade29ee7b48af907d (diff) |
SFI: Hook PCI MMCONFIG
First check ACPI, and if that fails, ask SFI to find the MCFG.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86/pci/mmconfig-shared.c | 6 | ||||
-rw-r--r-- | arch/x86/pci/mmconfig_32.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d8ba42418d33..4c92c91f354b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1880,7 +1880,7 @@ config PCI_DIRECT | |||
1880 | 1880 | ||
1881 | config PCI_MMCONFIG | 1881 | config PCI_MMCONFIG |
1882 | def_bool y | 1882 | def_bool y |
1883 | depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) | 1883 | depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY) |
1884 | 1884 | ||
1885 | config PCI_OLPC | 1885 | config PCI_OLPC |
1886 | def_bool y | 1886 | def_bool y |
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c index b707a0141d3b..602c172d3bd5 100644 --- a/arch/x86/pci/mmconfig-shared.c +++ b/arch/x86/pci/mmconfig-shared.c | |||
@@ -13,10 +13,12 @@ | |||
13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/acpi.h> | 15 | #include <linux/acpi.h> |
16 | #include <linux/sfi_acpi.h> | ||
16 | #include <linux/bitmap.h> | 17 | #include <linux/bitmap.h> |
17 | #include <linux/sort.h> | 18 | #include <linux/sort.h> |
18 | #include <asm/e820.h> | 19 | #include <asm/e820.h> |
19 | #include <asm/pci_x86.h> | 20 | #include <asm/pci_x86.h> |
21 | #include <asm/acpi.h> | ||
20 | 22 | ||
21 | #define PREFIX "PCI: " | 23 | #define PREFIX "PCI: " |
22 | 24 | ||
@@ -493,7 +495,7 @@ static void __init pci_mmcfg_reject_broken(int early) | |||
493 | (unsigned int)cfg->start_bus_number, | 495 | (unsigned int)cfg->start_bus_number, |
494 | (unsigned int)cfg->end_bus_number); | 496 | (unsigned int)cfg->end_bus_number); |
495 | 497 | ||
496 | if (!early) | 498 | if (!early && !acpi_disabled) |
497 | valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0); | 499 | valid = is_mmconf_reserved(is_acpi_reserved, addr, size, i, cfg, 0); |
498 | 500 | ||
499 | if (valid) | 501 | if (valid) |
@@ -608,7 +610,7 @@ static void __init __pci_mmcfg_init(int early) | |||
608 | } | 610 | } |
609 | 611 | ||
610 | if (!known_bridge) | 612 | if (!known_bridge) |
611 | acpi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg); | 613 | acpi_sfi_table_parse(ACPI_SIG_MCFG, pci_parse_mcfg); |
612 | 614 | ||
613 | pci_mmcfg_reject_broken(early); | 615 | pci_mmcfg_reject_broken(early); |
614 | 616 | ||
diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c index 8b2d561046a3..f10a7e94a84c 100644 --- a/arch/x86/pci/mmconfig_32.c +++ b/arch/x86/pci/mmconfig_32.c | |||
@@ -11,9 +11,9 @@ | |||
11 | 11 | ||
12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/acpi.h> | ||
15 | #include <asm/e820.h> | 14 | #include <asm/e820.h> |
16 | #include <asm/pci_x86.h> | 15 | #include <asm/pci_x86.h> |
16 | #include <acpi/acpi.h> | ||
17 | 17 | ||
18 | /* Assume systems with more busses have correct MCFG */ | 18 | /* Assume systems with more busses have correct MCFG */ |
19 | #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG)) | 19 | #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG)) |