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, 20 insertions, 20 deletions

diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index f3cae275d3f5..8c723c1b086a 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -281,27 +281,9 @@ pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus)
 void __devinit
 pcibios_fixup_bus(struct pci_bus *bus)
 {
-        /* Propagate hose info into the subordinate devices.  */
-
-        struct pci_controller *hose = bus->sysdata;
         struct pci_dev *dev = bus->self;
 
-        if (!dev) {
-                /* Root bus. */
-                u32 pci_mem_end;
-                u32 sg_base = hose->sg_pci ? hose->sg_pci->dma_base : ~0;
-                unsigned long end;
-
-                bus->resource[0] = hose->io_space;
-                bus->resource[1] = hose->mem_space;
-
-                /* Adjust hose mem_space limit to prevent PCI allocations
-                   in the iommu windows. */
-                pci_mem_end = min((u32)__direct_map_base, sg_base) - 1;
-                end = hose->mem_space->start + pci_mem_end;
-                if (hose->mem_space->end > end)
-                        hose->mem_space->end = end;
-        } else if (pci_probe_only &&
+        if (pci_probe_only && dev &&
                    (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
                 pci_read_bridge_bases(bus);
                 pcibios_fixup_device_resources(dev, bus);
@@ -414,13 +396,31 @@ void __init
 common_init_pci(void)
 {
         struct pci_controller *hose;
+        struct list_head resources;
         struct pci_bus *bus;
         int next_busno;
         int need_domain_info = 0;
+        u32 pci_mem_end;
+        u32 sg_base;
+        unsigned long end;
 
         /* Scan all of the recorded PCI controllers.  */
         for (next_busno = 0, hose = hose_head; hose; hose = hose->next) {
-                bus = pci_scan_bus(next_busno, alpha_mv.pci_ops, hose);
+                sg_base = hose->sg_pci ? hose->sg_pci->dma_base : ~0;
+
+                /* Adjust hose mem_space limit to prevent PCI allocations
+                   in the iommu windows. */
+                pci_mem_end = min((u32)__direct_map_base, sg_base) - 1;
+                end = hose->mem_space->start + pci_mem_end;
+                if (hose->mem_space->end > end)
+                        hose->mem_space->end = end;
+
+                INIT_LIST_HEAD(&resources);
+                pci_add_resource(&resources, hose->io_space);
+                pci_add_resource(&resources, hose->mem_space);
+
+                bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops,
+                                        hose, &resources);
                 hose->bus = bus;
                 hose->need_domain_info = need_domain_info;
                 next_busno = bus->subordinate + 1;