ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/pci: extend PCI config access to support devices behind PXB 

PXB buses are assumed to be children of bus 0. Look for them
while scanning the buses.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2015-06-02 14:23:00 +03:00 committed by Michael S. Tsirkin
parent ca6c18556c
commit 09e5b81922
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hw/pci/pci.c
View File

@ -1699,10 +1699,28 @@ static bool pci_secondary_bus_in_range(PCIDevice *dev, int bus_num)
{ {
return !(pci_get_word(dev->config + PCI_BRIDGE_CONTROL) & return !(pci_get_word(dev->config + PCI_BRIDGE_CONTROL) &
PCI_BRIDGE_CTL_BUS_RESET) /* Don't walk the bus if it's reset. */ && PCI_BRIDGE_CTL_BUS_RESET) /* Don't walk the bus if it's reset. */ &&
dev->config[PCI_SECONDARY_BUS] < bus_num && dev->config[PCI_SECONDARY_BUS] <= bus_num &&
bus_num <= dev->config[PCI_SUBORDINATE_BUS]; bus_num <= dev->config[PCI_SUBORDINATE_BUS];
} }
/* Whether a given bus number is in a range of a root bus */
static bool pci_root_bus_in_range(PCIBus *bus, int bus_num)
{
int i;
for (i = 0; i < ARRAY_SIZE(bus->devices); ++i) {
PCIDevice *dev = bus->devices[i];
if (dev && PCI_DEVICE_GET_CLASS(dev)->is_bridge) {
if (pci_secondary_bus_in_range(dev, bus_num)) {
return true;
}
}
}
return false;
}
static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num) static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num)
{ {
PCIBus *sec; PCIBus *sec;
@ -1724,12 +1742,18 @@ static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num)
/* try child bus */ /* try child bus */
for (; bus; bus = sec) { for (; bus; bus = sec) {
QLIST_FOREACH(sec, &bus->child, sibling) { QLIST_FOREACH(sec, &bus->child, sibling) {
assert(!pci_bus_is_root(sec)); if (pci_bus_num(sec) == bus_num) {
if (sec->parent_dev->config[PCI_SECONDARY_BUS] == bus_num) {
return sec; return sec;
} }
if (pci_secondary_bus_in_range(sec->parent_dev, bus_num)) { /* PXB buses assumed to be children of bus 0 */
break; if (pci_bus_is_root(sec)) {
if (pci_root_bus_in_range(sec, bus_num)) {
break;
}
} else {
if (pci_secondary_bus_in_range(sec->parent_dev, bus_num)) {
break;
}
} }
} }
} }