mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-04 06:16:46 +07:00
[POWERPC] celleb: Fix PCI config space accesses to subordinate buses
Checking whether bus->self is NULL is not enough to know "bus" is the primary bus. Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
d1af5b4ea9
commit
0f6e74a3e0
@ -133,13 +133,13 @@ static int celleb_epci_check_abort(struct pci_controller *hose,
|
||||
}
|
||||
|
||||
static volatile void __iomem *celleb_epci_make_config_addr(
|
||||
struct pci_bus *bus,
|
||||
struct pci_controller *hose,
|
||||
unsigned int devfn, int where)
|
||||
{
|
||||
volatile void __iomem *addr;
|
||||
struct pci_bus *bus = hose->bus;
|
||||
|
||||
if (bus->self)
|
||||
if (bus != hose->bus)
|
||||
addr = celleb_epci_get_epci_cfg(hose) +
|
||||
(((bus->number & 0xff) << 16)
|
||||
| ((devfn & 0xff) << 8)
|
||||
@ -193,7 +193,7 @@ static int celleb_epci_read_config(struct pci_bus *bus,
|
||||
} else {
|
||||
|
||||
clear_and_disable_master_abort_interrupt(hose);
|
||||
addr = celleb_epci_make_config_addr(hose, devfn, where);
|
||||
addr = celleb_epci_make_config_addr(bus, hose, devfn, where);
|
||||
|
||||
switch (size) {
|
||||
case 1:
|
||||
@ -257,7 +257,7 @@ static int celleb_epci_write_config(struct pci_bus *bus,
|
||||
} else {
|
||||
|
||||
clear_and_disable_master_abort_interrupt(hose);
|
||||
addr = celleb_epci_make_config_addr(hose, devfn, where);
|
||||
addr = celleb_epci_make_config_addr(bus, hose, devfn, where);
|
||||
|
||||
switch (size) {
|
||||
case 1:
|
||||
|
Loading…
Reference in New Issue
Block a user