3 files changed, 133 insertions, 21 deletions

diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index 3de9f9ba2da6..2080b04b3bcc 100644
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -11,9 +11,7 @@ static __init int pci_access_init(void)
 #ifdef CONFIG_PCI_DIRECT
         type = pci_direct_probe();
 #endif
-#ifdef CONFIG_PCI_MMCONFIG
-        pci_mmcfg_init(type);
-#endif
+        pci_mmcfg_early_init(type);
         if (raw_pci_ops)
                 return 0;
 #ifdef CONFIG_PCI_BIOS
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 8d54df4dfaad..498e35ee428e 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -173,9 +173,78 @@ static void __init pci_mmcfg_insert_resources(unsigned long resource_flags)
         pci_mmcfg_resources_inserted = 1;
 }
 
-static void __init pci_mmcfg_reject_broken(int type)
+static acpi_status __init check_mcfg_resource(struct acpi_resource *res,
+                                              void *data)
+{
+        struct resource *mcfg_res = data;
+        struct acpi_resource_address64 address;
+        acpi_status status;
+
+        if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
+                struct acpi_resource_fixed_memory32 *fixmem32 =
+                        &res->data.fixed_memory32;
+                if (!fixmem32)
+                        return AE_OK;
+                if ((mcfg_res->start >= fixmem32->address) &&
+                    (mcfg_res->end < (fixmem32->address +
+                                      fixmem32->address_length))) {
+                        mcfg_res->flags = 1;
+                        return AE_CTRL_TERMINATE;
+                }
+        }
+        if ((res->type != ACPI_RESOURCE_TYPE_ADDRESS32) &&
+            (res->type != ACPI_RESOURCE_TYPE_ADDRESS64))
+                return AE_OK;
+
+        status = acpi_resource_to_address64(res, &address);
+        if (ACPI_FAILURE(status) ||
+           (address.address_length <= 0) ||
+           (address.resource_type != ACPI_MEMORY_RANGE))
+                return AE_OK;
+
+        if ((mcfg_res->start >= address.minimum) &&
+            (mcfg_res->end < (address.minimum + address.address_length))) {
+                mcfg_res->flags = 1;
+                return AE_CTRL_TERMINATE;
+        }
+        return AE_OK;
+}
+
+static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl,
+                void *context, void **rv)
+{
+        struct resource *mcfg_res = context;
+
+        acpi_walk_resources(handle, METHOD_NAME__CRS,
+                            check_mcfg_resource, context);
+
+        if (mcfg_res->flags)
+                return AE_CTRL_TERMINATE;
+
+        return AE_OK;
+}
+
+static int __init is_acpi_reserved(unsigned long start, unsigned long end)
+{
+        struct resource mcfg_res;
+
+        mcfg_res.start = start;
+        mcfg_res.end = end;
+        mcfg_res.flags = 0;
+
+        acpi_get_devices("PNP0C01", find_mboard_resource, &mcfg_res, NULL);
+
+        if (!mcfg_res.flags)
+                acpi_get_devices("PNP0C02", find_mboard_resource, &mcfg_res,
+                                 NULL);
+
+        return mcfg_res.flags;
+}
+
+static void __init pci_mmcfg_reject_broken(void)
 {
         typeof(pci_mmcfg_config[0]) *cfg;
+        int i;
 
         if ((pci_mmcfg_config_num == 0) ||
             (pci_mmcfg_config == NULL) ||
@@ -196,17 +265,37 @@ static void __init pci_mmcfg_reject_broken(int type)
                 goto reject;
         }
 
-        /*
-         * Only do this check when type 1 works. If it doesn't work
-         * assume we run on a Mac and always use MCFG
-         */
-        if (type == 1 && !e820_all_mapped(cfg->address,
-                                          cfg->address + MMCONFIG_APER_MIN,
-                                          E820_RESERVED)) {
-                printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
-                       " E820-reserved\n", cfg->address);
-                goto reject;
+        for (i = 0; i < pci_mmcfg_config_num; i++) {
+                u32 size = (cfg->end_bus_number + 1) << 20;
+                cfg = &pci_mmcfg_config[i];
+                printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lu "
+                       "segment %hu buses %u - %u\n",
+                       i, (unsigned long)cfg->address, cfg->pci_segment,
+                       (unsigned int)cfg->start_bus_number,
+                       (unsigned int)cfg->end_bus_number);
+                if (is_acpi_reserved(cfg->address, cfg->address + size - 1)) {
+                        printk(KERN_NOTICE "PCI: MCFG area at %Lx reserved "
+                               "in ACPI motherboard resources\n",
+                               cfg->address);
+                } else {
+                        printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
+                               " reserved in ACPI motherboard resources\n",
+                               cfg->address);
+                        /* Don't try to do this check unless configuration
+                           type 1 is available. */
+                        if ((pci_probe & PCI_PROBE_CONF1) &&
+                            e820_all_mapped(cfg->address,
+                                            cfg->address + size - 1,
+                                            E820_RESERVED))
+                                printk(KERN_NOTICE
+                                       "PCI: MCFG area at %Lx reserved in "
+                                       "E820\n",
+                                       cfg->address);
+                        else
+                                goto reject;
+                }
         }
+
         return;
 
 reject:
@@ -216,20 +305,46 @@ reject:
         pci_mmcfg_config_num = 0;
 }
 
-void __init pci_mmcfg_init(int type)
+void __init pci_mmcfg_early_init(int type)
+{
+        if ((pci_probe & PCI_PROBE_MMCONF) == 0)
+                return;
+
+        /* If type 1 access is available, no need to enable MMCONFIG yet, we can
+           defer until later when the ACPI interpreter is available to better
+           validate things. */
+        if (type == 1)
+                return;
+
+        acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);
+
+        if ((pci_mmcfg_config_num == 0) ||
+            (pci_mmcfg_config == NULL) ||
+            (pci_mmcfg_config[0].address == 0))
+                return;
+
+        if (pci_mmcfg_arch_init())
+                pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
+}
+
+void __init pci_mmcfg_late_init(void)
 {
         int known_bridge = 0;
 
+        /* MMCONFIG disabled */
         if ((pci_probe & PCI_PROBE_MMCONF) == 0)
                 return;
 
-        if (type == 1 && pci_mmcfg_check_hostbridge())
-                known_bridge = 1;
+        /* MMCONFIG already enabled */
+        if (!(pci_probe & PCI_PROBE_MASK & ~PCI_PROBE_MMCONF))
+                return;
 
-        if (!known_bridge) {
+        if ((pci_probe & PCI_PROBE_CONF1) && pci_mmcfg_check_hostbridge())
+                known_bridge = 1;
+        else
                 acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);
-                pci_mmcfg_reject_broken(type);
-        }
+
+        pci_mmcfg_reject_broken();
 
         if ((pci_mmcfg_config_num == 0) ||
             (pci_mmcfg_config == NULL) ||
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index c4bddaeff619..28b9b72ce7c7 100644
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -97,7 +97,6 @@ extern struct pci_raw_ops pci_direct_conf1;
 extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
-extern void pci_mmcfg_init(int type);
 
 /* pci-mmconfig.c */