2 files changed, 11 insertions, 2 deletions

diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index 3dedf8f5bfb4..d490e71f0533 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -33,6 +33,7 @@ indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
         struct pci_controller *hose = bus->sysdata;
         volatile void __iomem *cfg_data;
         u8 cfg_type = 0;
+        u32 bus_no;
 
         if (ppc_md.pci_exclude_device)
                 if (ppc_md.pci_exclude_device(hose, bus->number, devfn))
@@ -42,8 +43,11 @@ indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                 if (bus->number != hose->first_busno)
                         cfg_type = 1;
 
+        bus_no = (bus->number == hose->first_busno) ?
+                        hose->self_busno : bus->number - hose->bus_offset;
+
         PCI_CFG_OUT(hose->cfg_addr,
-                 (0x80000000 | ((bus->number - hose->bus_offset) << 16)
+                 (0x80000000 | (bus_no << 16)
                   | (devfn << 8) | ((offset & 0xfc) | cfg_type)));
 
         /*
@@ -72,6 +76,7 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
         struct pci_controller *hose = bus->sysdata;
         volatile void __iomem *cfg_data;
         u8 cfg_type = 0;
+        u32 bus_no;
 
         if (ppc_md.pci_exclude_device)
                 if (ppc_md.pci_exclude_device(hose, bus->number, devfn))
@@ -81,8 +86,11 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
                 if (bus->number != hose->first_busno)
                         cfg_type = 1;
 
+        bus_no = (bus->number == hose->first_busno) ?
+                        hose->self_busno : bus->number - hose->bus_offset;
+
         PCI_CFG_OUT(hose->cfg_addr,
-                 (0x80000000 | ((bus->number - hose->bus_offset) << 16)
+                 (0x80000000 | (bus_no << 16)
                   | (devfn << 8) | ((offset & 0xfc) | cfg_type)));
 
         /*
diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
index 4d35b844bc58..2c2abdaad42f 100644
--- a/include/asm-ppc/pci-bridge.h
+++ b/include/asm-ppc/pci-bridge.h
@@ -47,6 +47,7 @@ struct pci_controller {
 
         int first_busno;
         int last_busno;
+        int self_busno;
         int bus_offset;
 
         void __iomem *io_base_virt;