|
@@ -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)));
|
|
|
|
|
|
/*
|