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.

1 files changed, 47 insertions, 43 deletions

diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index cd1026931203..61045c192e88 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -134,9 +134,46 @@ struct pci_controller * __init pcibios_alloc_controller(void)
         return pci_ctrl;
 }
 
+static void __init pci_controller_apertures(struct pci_controller *pci_ctrl,
+                                            struct list_head *resources)
+{
+        struct resource *res;
+        unsigned long io_offset;
+        int i;
+
+        io_offset = (unsigned long)pci_ctrl->io_space.base;
+        res = &pci_ctrl->io_resource;
+        if (!res->flags) {
+                if (io_offset)
+                        printk (KERN_ERR "I/O resource not set for host"
+                                " bridge %d\n", pci_ctrl->index);
+                res->start = 0;
+                res->end = IO_SPACE_LIMIT;
+                res->flags = IORESOURCE_IO;
+        }
+        res->start += io_offset;
+        res->end += io_offset;
+        pci_add_resource(resources, res);
+
+        for (i = 0; i < 3; i++) {
+                res = &pci_ctrl->mem_resources[i];
+                if (!res->flags) {
+                        if (i > 0)
+                                continue;
+                        printk(KERN_ERR "Memory resource not set for "
+                               "host bridge %d\n", pci_ctrl->index);
+                        res->start = 0;
+                        res->end = ~0U;
+                        res->flags = IORESOURCE_MEM;
+                }
+                pci_add_resource(resources, res);
+        }
+}
+
 static int __init pcibios_init(void)
 {
         struct pci_controller *pci_ctrl;
+        struct list_head resources;
         struct pci_bus *bus;
         int next_busno = 0, i;
 
@@ -145,19 +182,10 @@ static int __init pcibios_init(void)
         /* Scan all of the recorded PCI controllers.  */
         for (pci_ctrl = pci_ctrl_head; pci_ctrl; pci_ctrl = pci_ctrl->next) {
                 pci_ctrl->last_busno = 0xff;
-                bus = pci_scan_bus(pci_ctrl->first_busno, pci_ctrl->ops,
-                                   pci_ctrl);
-                if (pci_ctrl->io_resource.flags) {
-                        unsigned long offs;
-
-                        offs = (unsigned long)pci_ctrl->io_space.base;
-                        pci_ctrl->io_resource.start += offs;
-                        pci_ctrl->io_resource.end += offs;
-                        bus->resource[0] = &pci_ctrl->io_resource;
-                }
-                for (i = 0; i < 3; ++i)
-                        if (pci_ctrl->mem_resources[i].flags)
-                                bus->resource[i+1] =&pci_ctrl->mem_resources[i];
+                INIT_LIST_HEAD(&resources);
+                pci_controller_apertures(pci_ctrl, &resources);
+                bus = pci_scan_root_bus(NULL, pci_ctrl->first_busno,
+                                        pci_ctrl->ops, pci_ctrl, &resources);
                 pci_ctrl->bus = bus;
                 pci_ctrl->last_busno = bus->subordinate;
                 if (next_busno <= pci_ctrl->last_busno)
@@ -178,36 +206,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
         int i;
 
         io_offset = (unsigned long)pci_ctrl->io_space.base;
-        if (bus->parent == NULL) {
-                /* this is a host bridge - fill in its resources */
-                pci_ctrl->bus = bus;
-
-                bus->resource[0] = res = &pci_ctrl->io_resource;
-                if (!res->flags) {
-                        if (io_offset)
-                                printk (KERN_ERR "I/O resource not set for host"
-                                        " bridge %d\n", pci_ctrl->index);
-                        res->start = 0;
-                        res->end = IO_SPACE_LIMIT;
-                        res->flags = IORESOURCE_IO;
-                }
-                res->start += io_offset;
-                res->end += io_offset;
-
-                for (i = 0; i < 3; i++) {
-                        res = &pci_ctrl->mem_resources[i];
-                        if (!res->flags) {
-                                if (i > 0)
-                                        continue;
-                                printk(KERN_ERR "Memory resource not set for "
-                                       "host bridge %d\n", pci_ctrl->index);
-                                res->start = 0;
-                                res->end = ~0U;
-                                res->flags = IORESOURCE_MEM;
-                        }
-                        bus->resource[i+1] = res;
-                }
-        } else {
+        if (bus->parent) {
                 /* This is a subordinate bridge */
                 pci_read_bridge_bases(bus);
 
@@ -227,6 +226,11 @@ char __init *pcibios_setup(char *str)
         return str;
 }
 
+void pcibios_set_master(struct pci_dev *dev)
+{
+        /* No special bus mastering setup handling */
+}
+
 /* the next one is stolen from the alpha port... */
 
 void __init