Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
  x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
  PCI: Increase resource array mask bit size in pcim_iomap_regions()
  PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
  PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
  PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
  x86/PCI: amd: factor out MMCONFIG discovery
  PCI: Enable ATS at the device state restore
  PCI: msi: fix imbalanced refcount of msi irq sysfs objects
  PCI: kconfig: English typo in pci/pcie/Kconfig
  PCI/PM/Runtime: make PCI traces quieter
  PCI: remove pci_create_bus()
  xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
  x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
  x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
  x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
  sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
  sparc/PCI: convert to pci_create_root_bus()
  sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
  powerpc/PCI: convert to pci_create_root_bus()
  powerpc/PCI: split PHB part out of pcibios_map_io_space()
  ...

Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
to the same patches being applied in other branches.

2 files changed, 20 insertions, 29 deletions

diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 127dd7be346a..279b38ae74aa 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -43,12 +43,6 @@ extern unsigned long ia64_max_iommu_merge_mask;
 #define PCI_DMA_BUS_IS_PHYS     (ia64_max_iommu_merge_mask == ~0UL)
 
 static inline void
-pcibios_set_master (struct pci_dev *dev)
-{
-        /* No special bus mastering setup handling */
-}
-
-static inline void
 pcibios_penalize_isa_irq (int irq, int active)
 {
         /* We don't do dynamic PCI IRQ allocation */
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 2c27714d7b78..f82f5d4b65fd 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -134,6 +134,7 @@ alloc_pci_controller (int seg)
 struct pci_root_info {
         struct acpi_device *bridge;
         struct pci_controller *controller;
+        struct list_head resources;
         char *name;
 };
 
@@ -315,24 +316,13 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
                                  &window->resource);
         }
 
-        return AE_OK;
-}
-
-static void __devinit
-pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)
-{
-        int i;
+        /* HP's firmware has a hack to work around a Windows bug.
+         * Ignore these tiny memory ranges */
+        if (!((window->resource.flags & IORESOURCE_MEM) &&
+              (window->resource.end - window->resource.start < 16)))
+                pci_add_resource(&info->resources, &window->resource);
 
-        pci_bus_remove_resources(bus);
-        for (i = 0; i < ctrl->windows; i++) {
-                struct resource *res = &ctrl->window[i].resource;
-                /* HP's firmware has a hack to work around a Windows bug.
-                 * Ignore these tiny memory ranges */
-                if ((res->flags & IORESOURCE_MEM) &&
-                    (res->end - res->start < 16))
-                        continue;
-                pci_bus_add_resource(bus, res, 0);
-        }
+        return AE_OK;
 }
 
 struct pci_bus * __devinit
@@ -343,6 +333,7 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
         int bus = root->secondary.start;
         struct pci_controller *controller;
         unsigned int windows = 0;
+        struct pci_root_info info;
         struct pci_bus *pbus;
         char *name;
         int pxm;
@@ -359,11 +350,10 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
                 controller->node = pxm_to_node(pxm);
 #endif
 
+        INIT_LIST_HEAD(&info.resources);
         acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,
                         &windows);
         if (windows) {
-                struct pci_root_info info;
-
                 controller->window =
                         kmalloc_node(sizeof(*controller->window) * windows,
                                      GFP_KERNEL, controller->node);
@@ -387,8 +377,14 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
          * should handle the case here, but it appears that IA64 hasn't
          * such quirk. So we just ignore the case now.
          */
-        pbus = pci_scan_bus_parented(NULL, bus, &pci_root_ops, controller);
+        pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller,
+                                   &info.resources);
+        if (!pbus) {
+                pci_free_resource_list(&info.resources);
+                return NULL;
+        }
 
+        pbus->subordinate = pci_scan_child_bus(pbus);
         return pbus;
 
 out3:
@@ -504,14 +500,15 @@ pcibios_fixup_bus (struct pci_bus *b)
         if (b->self) {
                 pci_read_bridge_bases(b);
                 pcibios_fixup_bridge_resources(b->self);
-        } else {
-                pcibios_setup_root_windows(b, b->sysdata);
         }
         list_for_each_entry(dev, &b->devices, bus_list)
                 pcibios_fixup_device_resources(dev);
         platform_pci_fixup_bus(b);
+}
 
-        return;
+void pcibios_set_master (struct pci_dev *dev)
+{
+        /* No special bus mastering setup handling */
 }
 
 void __devinit