pci-phb: Set correct pci-bus-number while walking PCI bridges

Commit e44b7f07 ("Fix secondary and subordinate PCI bus enumeration")
created a board-qemu specific version of the pci-bridge-probe function
to fix problems with the secondary and  subordinate bus number
registers. Unfortunately, this function missed to update the
pci-bus-number variable like the original pci-bridge-probe function
did it, so that new bridges currently end up with a bad "my-bus"
setting (which is initialized from the pci-bus-number variable)
and thus things that depend on this setting, like the "decode-unit"
function currently don't work as expected on these PCI bridges.
Fix it by initializing the pci-bus-number from the PCI config
space settings that is provided by QEMU.

Fixes: e44b7f074f
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1459755
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
This commit is contained in:
Thomas Huth 2017-06-12 11:50:59 +02:00 committed by Alexey Kardashevskiy
parent d5997edcbc
commit 62674aabe2
1 changed files with 1 additions and 0 deletions

View File

@ -309,6 +309,7 @@ setup-puid
: phb-pci-bridge-probe ( addr -- ) : phb-pci-bridge-probe ( addr -- )
dup pci-bridge-set-bases \ Set up all Base Registers dup pci-bridge-set-bases \ Set up all Base Registers
dup func-pci-bridge-range-props \ Set up temporary "range" dup func-pci-bridge-range-props \ Set up temporary "range"
my-space pci-bus-scnd@ TO pci-bus-number \ Set correct current bus number
pci-device-vec-len 1+ TO pci-device-vec-len \ increase the device-slot vector depth pci-device-vec-len 1+ TO pci-device-vec-len \ increase the device-slot vector depth
pci-enable \ enable mem/IO transactions pci-enable \ enable mem/IO transactions
phb-pci-walk-bridge \ and walk the secondary bus phb-pci-walk-bridge \ and walk the secondary bus