[POWERPC] Removed remnants of bus_offset

Removed the remants of bus_offset and use self_busno in the mv64x60 case
and use pci_assign_all_buses on 83xx/85xx.

83xx/85xx have multiple PHBs and the firmwares on these devices tend not
to handle topologies with P2P bridges well so we let Linux just reassign
the bus numbers to match.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index 8da935c6e26901a67cbf5161511cb04a4a8d647d..f49ed277e8437b161c65c162c77d1c23259fa5b9 100644 (file)
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -61,6 +61,7 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
                       " bus 0\n", dev->full_name);
        }
 
+       pci_assign_all_buses = 1;
        hose = pcibios_alloc_controller();
        if (!hose)
                return -ENOMEM;
@@ -80,7 +81,6 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
        if ((rsrc.start & 0xfffff) == 0x8600) {
                setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384);
                primary = 0;
-               hose->bus_offset = hose->first_busno;
        }
 
        printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. "

diff --git a/arch/powerpc/platforms/85xx/pci.c b/arch/powerpc/platforms/85xx/pci.c
index be67f67ee6f40ebe95dfe9012da106e5a9e22dce..a25b3e77a7d295a7bc51fb4d6453f27ac10428bf 100644 (file)
--- a/arch/powerpc/platforms/85xx/pci.c
+++ b/arch/powerpc/platforms/85xx/pci.c
@@ -55,6 +55,7 @@ int __init mpc85xx_add_bridge(struct device_node *dev)
                       " bus 0\n", dev->full_name);
        }
 
+       pci_assign_all_buses = 1;
        hose = pcibios_alloc_controller();
        if (!hose)
                return -ENOMEM;
@@ -71,7 +72,6 @@ int __init mpc85xx_add_bridge(struct device_node *dev)
        if ((rsrc.start & 0xfffff) == 0x9000) {
                setup_indirect_pci(hose, immr + 0x9000, immr + 0x9004);
                primary = 0;
-               hose->bus_offset = hose->first_busno;
        }
 
        printk(KERN_INFO "Found MPC85xx PCI host bridge at 0x%016llx. "

diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index d490e71f05332f01fae238d9a9556d5eff1b70c3..efe3cff8dcd153284b318d189e08384493c097c4 100644 (file)
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -44,7 +44,7 @@ indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                        cfg_type = 1;
 
        bus_no = (bus->number == hose->first_busno) ?
-                       hose->self_busno : bus->number - hose->bus_offset;
+                       hose->self_busno : bus->number;
 
        PCI_CFG_OUT(hose->cfg_addr,
                 (0x80000000 | (bus_no << 16)
@@ -87,7 +87,7 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
                        cfg_type = 1;
 
        bus_no = (bus->number == hose->first_busno) ?
-                       hose->self_busno : bus->number - hose->bus_offset;
+                       hose->self_busno : bus->number;
 
        PCI_CFG_OUT(hose->cfg_addr,
                 (0x80000000 | (bus_no << 16)

diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c
index 6b08e76de5a2f9c7894f67a847fa7ec7d2375646..2e7738455ae599f932fdc170a0ed8f9c971f7470 100644 (file)
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -147,7 +147,7 @@ static int __init mv64x60_add_bridge(struct device_node *dev)
        hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
        setup_indirect_pci(hose, rsrc.start, rsrc.start + 4);
-       hose->bus_offset = hose->first_busno;
+       hose->self_busno = hose->first_busno;
 
        printk(KERN_INFO "Found MV64x60 PCI host bridge at 0x%016llx. "
               "Firmware bus number: %d->%d\n",

diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
index 2c2abdaad42fed84cfca774d7cd8c2cde781996d..70aab6691043e1d38f9fcf6dd48906a8e950e405 100644 (file)
--- a/include/asm-ppc/pci-bridge.h
+++ b/include/asm-ppc/pci-bridge.h
@@ -48,6 +48,7 @@ struct pci_controller {
        int first_busno;
        int last_busno;
        int self_busno;
+       /* bus_offset is only used by ARCH=ppc */
        int bus_offset;
 
        void __iomem *io_base_virt;