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

Pull PCI changes (including maintainer change) from Jesse Barnes:
 "This pull has some good cleanups from Bjorn and Yinghai, as well as
  some more code from Yinghai to better handle resource re-allocation
  when enabled.

  There's also a new initcall_debug feature from Arjan which will print
  out quirk timing information to help identify slow quirks for fixing
  or refinement (Yinghai sent in a few patches to do just that once the
  new debug code landed).

  Beyond that, I'm handing off PCI maintainership to Bjorn Helgaas.
  He's been a core PCI and Linux contributor for some time now, and has
  kindly volunteered to take over.  I just don't feel I have the time
  for PCI review and work that it deserves lately (I've taken on some
  other projects), and haven't been as responsive lately as I'd like, so
  I approached Bjorn asking if he'd like to manage things.  He's going
  to give it a try, and I'm confident he'll do at least as well as I
  have in keeping the tree managed, patches flowing, and keeping things
  stable."

Fix up some fairly trivial conflicts due to other cleanups (mips device
resource fixup cleanups clashing with list handling cleanup, ppc iseries
removal clashing with pci_probe_only cleanup etc)

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)
  PCI: Bjorn gets PCI hotplug too
  PCI: hand PCI maintenance over to Bjorn Helgaas
  unicore32/PCI: move <asm-generic/pci-bridge.h> include to asm/pci.h
  sparc/PCI: convert devtree and arch-probed bus addresses to resource
  powerpc/PCI: allow reallocation on PA Semi
  powerpc/PCI: convert devtree bus addresses to resource
  powerpc/PCI: compute I/O space bus-to-resource offset consistently
  arm/PCI: don't export pci_flags
  PCI: fix bridge I/O window bus-to-resource conversion
  x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()'
  PCI / PCIe: Introduce command line option to disable ARI
  PCI: make acpihp use __pci_remove_bus_device instead
  PCI: export __pci_remove_bus_device
  PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
  PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device
  PCI: print out PCI device info along with duration
  PCI: Move "pci reassigndev resource alignment" out of quirks.c
  PCI: Use class for quirk for usb host controller fixup
  PCI: Use class for quirk for ti816x class fixup
  PCI: Use class for quirk for intel e100 interrupt fixup
  ...

2 files changed, 12 insertions, 46 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 7ff10c1e866..0610e91bceb 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -553,7 +553,6 @@ dino_fixup_bus(struct pci_bus *bus)
         struct list_head *ln;
         struct pci_dev *dev;
         struct dino_device *dino_dev = DINO_DEV(parisc_walk_tree(bus->bridge));
-        int port_base = HBA_PORT_BASE(dino_dev->hba.hba_num);
 
         DBG(KERN_WARNING "%s(0x%p) bus %d platform_data 0x%p\n",
             __func__, bus, bus->secondary,
@@ -599,8 +598,6 @@ dino_fixup_bus(struct pci_bus *bus)
 
 
         list_for_each(ln, &bus->devices) {
-                int i;
-
                 dev = pci_dev_b(ln);
                 if (is_card_dino(&dino_dev->hba.dev->id))
                         dino_card_fixup(dev);
@@ -612,21 +609,6 @@ dino_fixup_bus(struct pci_bus *bus)
                 if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI)
                         continue;
 
-                /* Adjust the I/O Port space addresses */
-                for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                        struct resource *res = &dev->resource[i];
-                        if (res->flags & IORESOURCE_IO) {
-                                res->start |= port_base;
-                                res->end |= port_base;
-                        }
-#ifdef __LP64__
-                        /* Sign Extend MMIO addresses */
-                        else if (res->flags & IORESOURCE_MEM) {
-                                res->start |= F_EXTEND(0UL);
-                                res->end   |= F_EXTEND(0UL);
-                        }
-#endif
-                }
                 /* null out the ROM resource if there is one (we don't
                  * care about an expansion rom on parisc, since it
                  * usually contains (x86) bios code) */
@@ -991,11 +973,14 @@ static int __init dino_probe(struct parisc_device *dev)
 
         dev->dev.platform_data = dino_dev;
 
-        pci_add_resource(&resources, &dino_dev->hba.io_space);
+        pci_add_resource_offset(&resources, &dino_dev->hba.io_space,
+                                HBA_PORT_BASE(dino_dev->hba.hba_num));
         if (dino_dev->hba.lmmio_space.flags)
-                pci_add_resource(&resources, &dino_dev->hba.lmmio_space);
+                pci_add_resource_offset(&resources, &dino_dev->hba.lmmio_space,
+                                        dino_dev->hba.lmmio_space_offset);
         if (dino_dev->hba.elmmio_space.flags)
-                pci_add_resource(&resources, &dino_dev->hba.elmmio_space);
+                pci_add_resource_offset(&resources, &dino_dev->hba.elmmio_space,
+                                        dino_dev->hba.lmmio_space_offset);
         if (dino_dev->hba.gmmio_space.flags)
                 pci_add_resource(&resources, &dino_dev->hba.gmmio_space);
 
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index d5f3d753a10..e8857647e21 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -635,7 +635,6 @@ lba_fixup_bus(struct pci_bus *bus)
         u16 status;
 #endif
         struct lba_device *ldev = LBA_DEV(parisc_walk_tree(bus->bridge));
-        int lba_portbase = HBA_PORT_BASE(ldev->hba.hba_num);
 
         DBG("lba_fixup_bus(0x%p) bus %d platform_data 0x%p\n",
                 bus, bus->secondary, bus->bridge->platform_data);
@@ -726,27 +725,6 @@ lba_fixup_bus(struct pci_bus *bus)
                         if (!res->start)
                                 continue;
 
-                        if (res->flags & IORESOURCE_IO) {
-                                DBG("lba_fixup_bus() I/O Ports [%lx/%lx] -> ",
-                                        res->start, res->end);
-                                res->start |= lba_portbase;
-                                res->end   |= lba_portbase;
-                                DBG("[%lx/%lx]\n", res->start, res->end);
-                        } else if (res->flags & IORESOURCE_MEM) {
-                                /*
-                                ** Convert PCI (IO_VIEW) addresses to
-                                ** processor (PA_VIEW) addresses
-                                 */
-                                DBG("lba_fixup_bus() MMIO [%lx/%lx] -> ",
-                                        res->start, res->end);
-                                res->start = PCI_HOST_ADDR(HBA_DATA(ldev), res->start);
-                                res->end   = PCI_HOST_ADDR(HBA_DATA(ldev), res->end);
-                                DBG("[%lx/%lx]\n", res->start, res->end);
-                        } else {
-                                DBG("lba_fixup_bus() WTF? 0x%lx [%lx/%lx] XXX",
-                                        res->flags, res->start, res->end);
-                        }
-
                         /*
                         ** FIXME: this will result in whinging for devices
                         ** that share expansion ROMs (think quad tulip), but
@@ -1514,11 +1492,14 @@ lba_driver_probe(struct parisc_device *dev)
                 lba_dev->hba.lmmio_space.flags = 0;
         }
 
-        pci_add_resource(&resources, &lba_dev->hba.io_space);
+        pci_add_resource_offset(&resources, &lba_dev->hba.io_space,
+                                HBA_PORT_BASE(lba_dev->hba.hba_num));
         if (lba_dev->hba.elmmio_space.start)
-                pci_add_resource(&resources, &lba_dev->hba.elmmio_space);
+                pci_add_resource_offset(&resources, &lba_dev->hba.elmmio_space,
+                                        lba_dev->hba.lmmio_space_offset);
         if (lba_dev->hba.lmmio_space.flags)
-                pci_add_resource(&resources, &lba_dev->hba.lmmio_space);
+                pci_add_resource_offset(&resources, &lba_dev->hba.lmmio_space,
+                                        lba_dev->hba.lmmio_space_offset);
         if (lba_dev->hba.gmmio_space.flags)
                 pci_add_resource(&resources, &lba_dev->hba.gmmio_space);