[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V8 05/17] hw/pci: extend PCI config access to suppor
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH V8 05/17] hw/pci: extend PCI config access to support devices behind PXB |
Date: |
Tue, 2 Jun 2015 14:23:00 +0300 |
PXB buses are assumed to be children of bus 0. Look for them
while scanning the buses.
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/pci/pci.c | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 2f24f74..3361d85 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -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) &
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];
}
+/* 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)
{
PCIBus *sec;
@@ -1724,12 +1742,18 @@ static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num)
/* try child bus */
for (; bus; bus = sec) {
QLIST_FOREACH(sec, &bus->child, sibling) {
- assert(!pci_bus_is_root(sec));
- if (sec->parent_dev->config[PCI_SECONDARY_BUS] == bus_num) {
+ if (pci_bus_num(sec) == bus_num) {
return sec;
}
- if (pci_secondary_bus_in_range(sec->parent_dev, bus_num)) {
- break;
+ /* PXB buses assumed to be children of bus 0 */
+ 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;
+ }
}
}
}
--
2.1.0
- [Qemu-devel] [PATCH V8 00/17] hw/pc: implement multiple primary busses for pc machines, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 01/17] acpi: add implementation of aml_while() term, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 02/17] hw/pci: made pci_bus_is_root a PCIBusClass method, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 03/17] hw/pci: made pci_bus_num a PCIBusClass method, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 04/17] hw/i386: query only for q35/pc when looking for pci host bridge, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 05/17] hw/pci: extend PCI config access to support devices behind PXB,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH V8 06/17] hw/acpi: add support for i440fx 'snooping' root busses, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 07/17] hw/apci: add _PRT method for extra PCI root busses, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 08/17] hw/acpi: add _CRS method for extra root busses, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 10/17] hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 09/17] hw/acpi: remove from root bus 0 the crs resources used by other buses., Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 12/17] hw/pci: inform bios if the system has extra pci root buses, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 13/17] hw/pxb: add map_irq func, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 11/17] hw/pci: introduce PCI Expander Bridge (PXB), Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 14/17] hw/pci: add support for NUMA nodes, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 15/17] hw/pxb: add numa_node parameter, Marcel Apfelbaum, 2015/06/02