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, 19 insertions, 28 deletions

diff --git a/arch/sparc/kernel/leon_pci.c b/arch/sparc/kernel/leon_pci.c
index f1cf6ef011a7..c7bec25fdb1c 100644
--- a/arch/sparc/kernel/leon_pci.c
+++ b/arch/sparc/kernel/leon_pci.c
@@ -19,22 +19,22 @@
  */
 void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)
 {
+        LIST_HEAD(resources);
         struct pci_bus *root_bus;
 
-        root_bus = pci_scan_bus_parented(&ofdev->dev, 0, info->ops, info);
-        if (root_bus) {
-                root_bus->resource[0] = &info->io_space;
-                root_bus->resource[1] = &info->mem_space;
-                root_bus->resource[2] = NULL;
-
-                /* Init all PCI devices into PCI tree */
-                pci_bus_add_devices(root_bus);
+        pci_add_resource(&resources, &info->io_space);
+        pci_add_resource(&resources, &info->mem_space);
 
+        root_bus = pci_scan_root_bus(&ofdev->dev, 0, info->ops, info,
+                                     &resources);
+        if (root_bus) {
                 /* Setup IRQs of all devices using custom routines */
                 pci_fixup_irqs(pci_common_swizzle, info->map_irq);
 
                 /* Assign devices with resources */
                 pci_assign_unassigned_resources();
+        } else {
+                pci_free_resource_list(&resources);
         }
 }
 
@@ -83,15 +83,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *pbus)
         int i, has_io, has_mem;
         u16 cmd;
 
-        /* Generic PCI bus probing sets these to point at
-         * &io{port,mem}_resouce which is wrong for us.
-         */
-        if (pbus->self == NULL) {
-                pbus->resource[0] = &info->io_space;
-                pbus->resource[1] = &info->mem_space;
-                pbus->resource[2] = NULL;
-        }
-
         list_for_each_entry(dev, &pbus->devices, bus_list) {
                 /*
                  * We can not rely on that the bootloader has enabled I/O
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 31111e35281e..bb8bc2e519ac 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -685,23 +685,25 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)
 struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
                                             struct device *parent)
 {
+        LIST_HEAD(resources);
         struct device_node *node = pbm->op->dev.of_node;
         struct pci_bus *bus;
 
         printk("PCI: Scanning PBM %s\n", node->full_name);
 
-        bus = pci_create_bus(parent, pbm->pci_first_busno, pbm->pci_ops, pbm);
+        pci_add_resource(&resources, &pbm->io_space);
+        pci_add_resource(&resources, &pbm->mem_space);
+        bus = pci_create_root_bus(parent, pbm->pci_first_busno, pbm->pci_ops,
+                                  pbm, &resources);
         if (!bus) {
                 printk(KERN_ERR "Failed to create bus for %s\n",
                        node->full_name);
+                pci_free_resource_list(&resources);
                 return NULL;
         }
         bus->secondary = pbm->pci_first_busno;
         bus->subordinate = pbm->pci_last_busno;
 
-        bus->resource[0] = &pbm->io_space;
-        bus->resource[1] = &pbm->mem_space;
-
         pci_of_scan_bus(pbm, node, bus);
         pci_bus_add_devices(bus);
         pci_bus_register_of_sysfs(bus);
@@ -711,13 +713,6 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm,
 
 void __devinit pcibios_fixup_bus(struct pci_bus *pbus)
 {
-        struct pci_pbm_info *pbm = pbus->sysdata;
-
-        /* Generic PCI bus probing sets these to point at
-         * &io{port,mem}_resouce which is wrong for us.
-         */
-        pbus->resource[0] = &pbm->io_space;
-        pbus->resource[1] = &pbm->mem_space;
 }
 
 void pcibios_update_irq(struct pci_dev *pdev, int irq)
@@ -1083,6 +1078,11 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,
         *end = rp->end - offset;
 }
 
+void pcibios_set_master(struct pci_dev *dev)
+{
+        /* No special bus mastering setup handling */
+}
+
 static int __init pcibios_init(void)
 {
         pci_dfl_cache_line_size = 64 >> 2;