Merge tag 'please-pull-root_bus_hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 IOH hotplug fixes from Tony Luck:
 "Series to fix IOH hotplug in ia64"

* tag 'please-pull-root_bus_hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  PCI: Replace printks with appropriate pr_*()
  PCI/IA64: introduce probe_pci_root_info() to manage _CRS resource
  PCI/IA64: Add host bridge resource release for _CRS path
  PCI/IA64: fix memleak for create pci root bus fail
  PCI/IA64: Allocate pci_root_info instead of using stack
  PCI/IA64: embed pci hostbridge resources into pci_root_info
  PCI/IA64: SN: use normal resource instead of pci_window
  PCI/IA64: SN: remove sn_pci_window_fixup()

1 files changed, 26 insertions, 83 deletions

diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 238e2c511d94..2b00adedc45e 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -118,76 +118,26 @@ static void __init sn_fixup_ionodes(void)
 }
 
 /*
- * sn_pci_legacy_window_fixup - Create PCI controller windows for
+ * sn_pci_legacy_window_fixup - Setup PCI resources for
  *                              legacy IO and MEM space. This needs to
  *                              be done here, as the PROM does not have
  *                              ACPI support defining the root buses
  *                              and their resources (_CRS),
  */
 static void
-sn_legacy_pci_window_fixup(struct pci_controller *controller,
-                           u64 legacy_io, u64 legacy_mem)
+sn_legacy_pci_window_fixup(struct resource *res,
+                u64 legacy_io, u64 legacy_mem)
 {
-                controller->window = kcalloc(2, sizeof(struct pci_window),
-                                             GFP_KERNEL);
-                BUG_ON(controller->window == NULL);
-                controller->window[0].offset = legacy_io;
-                controller->window[0].resource.name = "legacy_io";
-                controller->window[0].resource.flags = IORESOURCE_IO;
-                controller->window[0].resource.start = legacy_io;
-                controller->window[0].resource.end =
-                                controller->window[0].resource.start + 0xffff;
-                controller->window[0].resource.parent = &ioport_resource;
-                controller->window[1].offset = legacy_mem;
-                controller->window[1].resource.name = "legacy_mem";
-                controller->window[1].resource.flags = IORESOURCE_MEM;
-                controller->window[1].resource.start = legacy_mem;
-                controller->window[1].resource.end =
-                       controller->window[1].resource.start + (1024 * 1024) - 1;
-                controller->window[1].resource.parent = &iomem_resource;
-                controller->windows = 2;
-}
-
-/*
- * sn_pci_window_fixup() - Create a pci_window for each device resource.
- *                         It will setup pci_windows for use by
- *                         pcibios_bus_to_resource(), pcibios_resource_to_bus(),
- *                         etc.
- */
-static void
-sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
-                    s64 * pci_addrs)
-{
-        struct pci_controller *controller = PCI_CONTROLLER(dev->bus);
-        unsigned int i;
-        unsigned int idx;
-        unsigned int new_count;
-        struct pci_window *new_window;
-
-        if (count == 0)
-                return;
-        idx = controller->windows;
-        new_count = controller->windows + count;
-        new_window = kcalloc(new_count, sizeof(struct pci_window), GFP_KERNEL);
-        BUG_ON(new_window == NULL);
-        if (controller->window) {
-                memcpy(new_window, controller->window,
-                       sizeof(struct pci_window) * controller->windows);
-                kfree(controller->window);
-        }
-
-        /* Setup a pci_window for each device resource. */
-        for (i = 0; i <= PCI_ROM_RESOURCE; i++) {
-                if (pci_addrs[i] == -1)
-                        continue;
-
-                new_window[idx].offset = dev->resource[i].start - pci_addrs[i];
-                new_window[idx].resource = dev->resource[i];
-                idx++;
-        }
-
-        controller->windows = new_count;
-        controller->window = new_window;
+                res[0].name = "legacy_io";
+                res[0].flags = IORESOURCE_IO;
+                res[0].start = legacy_io;
+                res[0].end = res[0].start + 0xffff;
+                res[0].parent = &ioport_resource;
+                res[1].name = "legacy_mem";
+                res[1].flags = IORESOURCE_MEM;
+                res[1].start = legacy_mem;
+                res[1].end = res[1].start + (1024 * 1024) - 1;
+                res[1].parent = &iomem_resource;
 }
 
 /*
@@ -199,9 +149,7 @@ sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
 void
 sn_io_slot_fixup(struct pci_dev *dev)
 {
-        unsigned int count = 0;
         int idx;
-        s64 pci_addrs[PCI_ROM_RESOURCE + 1];
         unsigned long addr, end, size, start;
         struct pcidev_info *pcidev_info;
         struct sn_irq_info *sn_irq_info;
@@ -229,7 +177,6 @@ sn_io_slot_fixup(struct pci_dev *dev)
         for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
 
                 if (!pcidev_info->pdi_pio_mapped_addr[idx]) {
-                        pci_addrs[idx] = -1;
                         continue;
                 }
 
@@ -237,11 +184,8 @@ sn_io_slot_fixup(struct pci_dev *dev)
                 end = dev->resource[idx].end;
                 size = end - start;
                 if (size == 0) {
-                        pci_addrs[idx] = -1;
                         continue;
                 }
-                pci_addrs[idx] = start;
-                count++;
                 addr = pcidev_info->pdi_pio_mapped_addr[idx];
                 addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET;
                 dev->resource[idx].start = addr;
@@ -276,11 +220,6 @@ sn_io_slot_fixup(struct pci_dev *dev)
                                                  IORESOURCE_ROM_BIOS_COPY;
                 }
         }
-        /* Create a pci_window in the pci_controller struct for
-         * each device resource.
-         */
-        if (count > 0)
-                sn_pci_window_fixup(dev, count, pci_addrs);
 
         sn_pci_fixup_slot(dev, pcidev_info, sn_irq_info);
 }
@@ -297,8 +236,8 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
         s64 status = 0;
         struct pci_controller *controller;
         struct pcibus_bussoft *prom_bussoft_ptr;
+        struct resource *res;
         LIST_HEAD(resources);
-        int i;
 
         status = sal_get_pcibus_info((u64) segment, (u64) busnum,
                                      (u64) ia64_tpa(&prom_bussoft_ptr));
@@ -310,19 +249,23 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
         BUG_ON(!controller);
         controller->segment = segment;
 
+        res = kcalloc(2, sizeof(struct resource), GFP_KERNEL);
+        BUG_ON(!res);
+
         /*
          * Temporarily save the prom_bussoft_ptr for use by sn_bus_fixup().
          * (platform_data will be overwritten later in sn_common_bus_fixup())
          */
         controller->platform_data = prom_bussoft_ptr;
 
-        sn_legacy_pci_window_fixup(controller,
-                                   prom_bussoft_ptr->bs_legacy_io,
-                                   prom_bussoft_ptr->bs_legacy_mem);
-        for (i = 0; i < controller->windows; i++)
-                pci_add_resource_offset(&resources,
-                                        &controller->window[i].resource,
-                                        controller->window[i].offset);
+        sn_legacy_pci_window_fixup(res,
+                        prom_bussoft_ptr->bs_legacy_io,
+                        prom_bussoft_ptr->bs_legacy_mem);
+        pci_add_resource_offset(&resources,     &res[0],
+                        prom_bussoft_ptr->bs_legacy_io);
+        pci_add_resource_offset(&resources,     &res[1],
+                        prom_bussoft_ptr->bs_legacy_mem);
+
         bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller,
                                 &resources);
         if (bus == NULL)
@@ -333,7 +276,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
         return;
 
 error_return:
-
+        kfree(res);
         kfree(controller);
         return;
 }