x86: split e820 reserved entries record to late v2

so could let BAR res register at first, or even pnp.

v2: insert e820 reserve resources before pnp_system_init

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 79 insertions, 0 deletions

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 8791fc55e715..40811efaa25a 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -31,8 +31,12 @@
 #include <linux/ioport.h>
 #include <linux/errno.h>
 #include <linux/bootmem.h>
+#include <linux/acpi.h>
 
 #include <asm/pat.h>
+#include <asm/hpet.h>
+#include <asm/io_apic.h>
+#include <asm/e820.h>
 
 #include "pci.h"
 
@@ -77,6 +81,77 @@ pcibios_align_resource(void *data, struct resource *res,
 }
 EXPORT_SYMBOL(pcibios_align_resource);
 
+static int check_res_with_valid(struct pci_dev *dev, struct resource *res)
+{
+        unsigned long base;
+        unsigned long size;
+        int i;
+
+        base = res->start;
+        size = (res->start == 0 && res->end == res->start) ? 0 :
+                 (res->end - res->start + 1);
+
+        if (!base || !size)
+                return 0;
+
+#ifdef CONFIG_HPET_TIMER
+        /* for hpet */
+        if (base == hpet_address && (res->flags & IORESOURCE_MEM)) {
+                dev_info(&dev->dev, "BAR has HPET at %08lx-%08lx\n",
+                                 base, base + size - 1);
+                return 1;
+        }
+#endif
+
+#ifdef CONFIG_X86_IO_APIC
+        for (i = 0; i < nr_ioapics; i++) {
+                unsigned long ioapic_phys = mp_ioapics[i].mp_apicaddr;
+
+                if (base == ioapic_phys && (res->flags & IORESOURCE_MEM)) {
+                        dev_info(&dev->dev, "BAR has ioapic at %08lx-%08lx\n",
+                                         base, base + size - 1);
+                        return 1;
+                }
+        }
+#endif
+
+#ifdef CONFIG_PCI_MMCONFIG
+        for (i = 0; i < pci_mmcfg_config_num; i++) {
+                unsigned long addr;
+
+                addr = pci_mmcfg_config[i].address;
+                if (base == addr && (res->flags & IORESOURCE_MEM)) {
+                        dev_info(&dev->dev, "BAR has MMCONFIG at %08lx-%08lx\n",
+                                         base, base + size - 1);
+                        return 1;
+                }
+        }
+#endif
+
+        return 0;
+}
+
+static int check_platform(struct pci_dev *dev, struct resource *res)
+{
+        struct resource *root = NULL;
+
+        /*
+         * forcibly insert it into the
+         * resource tree
+         */
+        if (res->flags & IORESOURCE_MEM)
+                root = &iomem_resource;
+        else if (res->flags & IORESOURCE_IO)
+                root = &ioport_resource;
+
+        if (root && check_res_with_valid(dev, res)) {
+                insert_resource(root, res);
+
+                return 1;
+        }
+
+        return 0;
+}
 /*
  *  Handle resources of PCI devices.  If the world were perfect, we could
  *  just allocate all the resource regions and do nothing more.  It isn't.
@@ -128,6 +203,8 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
                                 pr = pci_find_parent_resource(dev, r);
                                 if (!r->start || !pr ||
                                     request_resource(pr, r) < 0) {
+                                        if (check_platform(dev, r))
+                                                continue;
                                         dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);
                                         /*
                                          * Something is wrong with the region.
@@ -169,6 +246,8 @@ static void __init pcibios_allocate_resources(int pass)
                                         r->flags, disabled, pass);
                                 pr = pci_find_parent_resource(dev, r);
                                 if (!pr || request_resource(pr, r) < 0) {
+                                        if (check_platform(dev, r))
+                                                continue;
                                         dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);
                                         /* We'll assign a new address later */
                                         r->end -= r->start;