PCI: Convert pcibios_resource_to_bus() to take a pci_bus, not a pci_dev

These interfaces:

  pcibios_resource_to_bus(struct pci_dev *dev, *bus_region, *resource)
  pcibios_bus_to_resource(struct pci_dev *dev, *resource, *bus_region)

took a pci_dev, but they really depend only on the pci_bus.  And we want to
use them in resource allocation paths where we have the bus but not a
device, so this patch converts them to take the pci_bus instead of the
pci_dev:

  pcibios_resource_to_bus(struct pci_bus *bus, *bus_region, *resource)
  pcibios_bus_to_resource(struct pci_bus *bus, *resource, *bus_region)

In fact, with standard PCI-PCI bridges, they only depend on the host
bridge, because that's the only place address translation occurs, but
we aren't going that far yet.

[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

6 files changed, 28 insertions, 31 deletions

diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
index a68dc613a5be..06ace6248c61 100644
--- a/drivers/pci/host-bridge.c
+++ b/drivers/pci/host-bridge.c
@@ -9,22 +9,19 @@
 
 #include "pci.h"
 
-static struct pci_bus *find_pci_root_bus(struct pci_dev *dev)
+static struct pci_bus *find_pci_root_bus(struct pci_bus *bus)
 {
-        struct pci_bus *bus;
-
-        bus = dev->bus;
         while (bus->parent)
                 bus = bus->parent;
 
         return bus;
 }
 
-static struct pci_host_bridge *find_pci_host_bridge(struct pci_dev *dev)
+static struct pci_host_bridge *find_pci_host_bridge(struct pci_bus *bus)
 {
-        struct pci_bus *bus = find_pci_root_bus(dev);
+        struct pci_bus *root_bus = find_pci_root_bus(bus);
 
-        return to_pci_host_bridge(bus->bridge);
+        return to_pci_host_bridge(root_bus->bridge);
 }
 
 void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
@@ -40,10 +37,10 @@ static bool resource_contains(struct resource *res1, struct resource *res2)
         return res1->start <= res2->start && res1->end >= res2->end;
 }
 
-void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
+void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region,
                              struct resource *res)
 {
-        struct pci_host_bridge *bridge = find_pci_host_bridge(dev);
+        struct pci_host_bridge *bridge = find_pci_host_bridge(bus);
         struct pci_host_bridge_window *window;
         resource_size_t offset = 0;
 
@@ -68,10 +65,10 @@ static bool region_contains(struct pci_bus_region *region1,
         return region1->start <= region2->start && region1->end >= region2->end;
 }
 
-void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
+void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res,
                              struct pci_bus_region *region)
 {
-        struct pci_host_bridge *bridge = find_pci_host_bridge(dev);
+        struct pci_host_bridge *bridge = find_pci_host_bridge(bus);
         struct pci_host_bridge_window *window;
         resource_size_t offset = 0;
 
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 38e403dddf6e..f049e3f53fcc 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -269,8 +269,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
                 region.end = l + sz;
         }
 
-        pcibios_bus_to_resource(dev, res, &region);
-        pcibios_resource_to_bus(dev, &inverted_region, res);
+        pcibios_bus_to_resource(dev->bus, res, &region);
+        pcibios_resource_to_bus(dev->bus, &inverted_region, res);
 
         /*
          * If "A" is a BAR value (a bus address), "bus_to_resource(A)" is
@@ -364,7 +364,7 @@ static void pci_read_bridge_io(struct pci_bus *child)
                 res->flags = (io_base_lo & PCI_IO_RANGE_TYPE_MASK) | IORESOURCE_IO;
                 region.start = base;
                 region.end = limit + io_granularity - 1;
-                pcibios_bus_to_resource(dev, res, &region);
+                pcibios_bus_to_resource(dev->bus, res, &region);
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
         }
 }
@@ -386,7 +386,7 @@ static void pci_read_bridge_mmio(struct pci_bus *child)
                 res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
                 region.start = base;
                 region.end = limit + 0xfffff;
-                pcibios_bus_to_resource(dev, res, &region);
+                pcibios_bus_to_resource(dev->bus, res, &region);
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
         }
 }
@@ -436,7 +436,7 @@ static void pci_read_bridge_mmio_pref(struct pci_bus *child)
                         res->flags |= IORESOURCE_MEM_64;
                 region.start = base;
                 region.end = limit + 0xfffff;
-                pcibios_bus_to_resource(dev, res, &region);
+                pcibios_bus_to_resource(dev->bus, res, &region);
                 dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);
         }
 }
@@ -1084,24 +1084,24 @@ int pci_setup_device(struct pci_dev *dev)
                                 region.end = 0x1F7;
                                 res = &dev->resource[0];
                                 res->flags = LEGACY_IO_RESOURCE;
-                                pcibios_bus_to_resource(dev, res, &region);
+                                pcibios_bus_to_resource(dev->bus, res, &region);
                                 region.start = 0x3F6;
                                 region.end = 0x3F6;
                                 res = &dev->resource[1];
                                 res->flags = LEGACY_IO_RESOURCE;
-                                pcibios_bus_to_resource(dev, res, &region);
+                                pcibios_bus_to_resource(dev->bus, res, &region);
                         }
                         if ((progif & 4) == 0) {
                                 region.start = 0x170;
                                 region.end = 0x177;
                                 res = &dev->resource[2];
                                 res->flags = LEGACY_IO_RESOURCE;
-                                pcibios_bus_to_resource(dev, res, &region);
+                                pcibios_bus_to_resource(dev->bus, res, &region);
                                 region.start = 0x376;
                                 region.end = 0x376;
                                 res = &dev->resource[3];
                                 res->flags = LEGACY_IO_RESOURCE;
-                                pcibios_bus_to_resource(dev, res, &region);
+                                pcibios_bus_to_resource(dev->bus, res, &region);
                         }
                 }
                 break;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index b3b1b9aa8863..4ad6bf6c107b 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -343,7 +343,7 @@ static void quirk_io_region(struct pci_dev *dev, int port,
         /* Convert from PCI bus to resource space */
         bus_region.start = region;
         bus_region.end = region + size - 1;
-        pcibios_bus_to_resource(dev, res, &bus_region);
+        pcibios_bus_to_resource(dev->bus, res, &bus_region);
 
         if (!pci_claim_resource(dev, nr))
                 dev_info(&dev->dev, "quirk: %pR claimed by %s\n", res, name);
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index c5d0a08a8747..5d595724e5f4 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -31,7 +31,7 @@ int pci_enable_rom(struct pci_dev *pdev)
         if (!res->flags)
                 return -1;
 
-        pcibios_resource_to_bus(pdev, &region, res);
+        pcibios_resource_to_bus(pdev->bus, &region, res);
         pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr);
         rom_addr &= ~PCI_ROM_ADDRESS_MASK;
         rom_addr |= region.start | PCI_ROM_ADDRESS_ENABLE;
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 219a4106480a..79339822d80e 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -475,7 +475,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
                  &bus->busn_res);
 
         res = bus->resource[0];
-        pcibios_resource_to_bus(bridge, &region, res);
+        pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_IO) {
                 /*
                  * The IO resource is allocated a range twice as large as it
@@ -489,7 +489,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
         }
 
         res = bus->resource[1];
-        pcibios_resource_to_bus(bridge, &region, res);
+        pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_IO) {
                 dev_info(&bridge->dev, "  bridge window %pR\n", res);
                 pci_write_config_dword(bridge, PCI_CB_IO_BASE_1,
@@ -499,7 +499,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
         }
 
         res = bus->resource[2];
-        pcibios_resource_to_bus(bridge, &region, res);
+        pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_MEM) {
                 dev_info(&bridge->dev, "  bridge window %pR\n", res);
                 pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_0,
@@ -509,7 +509,7 @@ void pci_setup_cardbus(struct pci_bus *bus)
         }
 
         res = bus->resource[3];
-        pcibios_resource_to_bus(bridge, &region, res);
+        pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_MEM) {
                 dev_info(&bridge->dev, "  bridge window %pR\n", res);
                 pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_1,
@@ -546,7 +546,7 @@ static void pci_setup_bridge_io(struct pci_bus *bus)
 
         /* Set up the top and bottom of the PCI I/O segment for this bus. */
         res = bus->resource[0];
-        pcibios_resource_to_bus(bridge, &region, res);
+        pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_IO) {
                 pci_read_config_dword(bridge, PCI_IO_BASE, &l);
                 l &= 0xffff0000;
@@ -578,7 +578,7 @@ static void pci_setup_bridge_mmio(struct pci_bus *bus)
 
         /* Set up the top and bottom of the PCI Memory segment for this bus. */
         res = bus->resource[1];
-        pcibios_resource_to_bus(bridge, &region, res);
+        pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_MEM) {
                 l = (region.start >> 16) & 0xfff0;
                 l |= region.end & 0xfff00000;
@@ -604,7 +604,7 @@ static void pci_setup_bridge_mmio_pref(struct pci_bus *bus)
         /* Set up PREF base/limit. */
         bu = lu = 0;
         res = bus->resource[2];
-        pcibios_resource_to_bus(bridge, &region, res);
+        pcibios_resource_to_bus(bridge->bus, &region, res);
         if (res->flags & IORESOURCE_PREFETCH) {
                 l = (region.start >> 16) & 0xfff0;
                 l |= region.end & 0xfff00000;
@@ -1422,7 +1422,7 @@ static int iov_resources_unassigned(struct pci_dev *dev, void *data)
                 if (!r->flags)
                         continue;
 
-                pcibios_resource_to_bus(dev, &region, r);
+                pcibios_resource_to_bus(dev->bus, &region, r);
                 if (!region.start) {
                         *unassigned = true;
                         return 1; /* return early from pci_walk_bus() */
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 83c4d3bc47ab..5c060b152ce6 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -52,7 +52,7 @@ void pci_update_resource(struct pci_dev *dev, int resno)
         if (res->flags & IORESOURCE_PCI_FIXED)
                 return;
 
-        pcibios_resource_to_bus(dev, &region, res);
+        pcibios_resource_to_bus(dev->bus, &region, res);
 
         new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
         if (res->flags & IORESOURCE_IO)