[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V8 13/17] hw/pxb: add map_irq func
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH V8 13/17] hw/pxb: add map_irq func |
Date: |
Tue, 2 Jun 2015 14:23:08 +0300 |
The bios does not index the pxb slot number when
it computes the IRQ because it resides on bus 0
and not on the current bus.
However Qemu routes the irq through bus 0 and adds
the pxb slot to the IRQ computation of the PXB device.
Synchronize between bios and Qemu by canceling
pxb's effect.
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/pci-bridge/pci_expander_bridge.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/hw/pci-bridge/pci_expander_bridge.c
b/hw/pci-bridge/pci_expander_bridge.c
index 88e85c1..8660a00 100644
--- a/hw/pci-bridge/pci_expander_bridge.c
+++ b/hw/pci-bridge/pci_expander_bridge.c
@@ -120,6 +120,24 @@ static int pxb_register_bus(PCIDevice *dev, PCIBus
*pxb_bus)
return 0;
}
+static int pxb_map_irq_fn(PCIDevice *pci_dev, int pin)
+{
+ PCIDevice *pxb = pci_dev->bus->parent_dev;
+
+ /*
+ * The bios does not index the pxb slot number when
+ * it computes the IRQ because it resides on bus 0
+ * and not on the current bus.
+ * However QEMU routes the irq through bus 0 and adds
+ * the pxb slot to the IRQ computation of the PXB
+ * device.
+ *
+ * Synchronize between bios and QEMU by canceling
+ * pxb's effect.
+ */
+ return pin - PCI_SLOT(pxb->devfn);
+}
+
static int pxb_dev_initfn(PCIDevice *dev)
{
PXBDev *pxb = PXB_DEV(dev);
@@ -137,7 +155,7 @@ static int pxb_dev_initfn(PCIDevice *dev)
bus->parent_dev = dev;
bus->address_space_mem = dev->bus->address_space_mem;
bus->address_space_io = dev->bus->address_space_io;
- bus->map_irq = pci_swizzle_map_irq_fn;
+ bus->map_irq = pxb_map_irq_fn;
bds = qdev_create(BUS(bus), "pci-bridge");
bds->id = dev_name;
--
2.1.0
- [Qemu-devel] [PATCH V8 02/17] hw/pci: made pci_bus_is_root a PCIBusClass method, (continued)
- [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, 2015/06/02
- [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 <=
- [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
- [Qemu-devel] [PATCH V8 16/17] apci: fix PXB behaviour if used with unsupported BIOS, Marcel Apfelbaum, 2015/06/02
- [Qemu-devel] [PATCH V8 17/17] docs: Add PXB documentation, Marcel Apfelbaum, 2015/06/02
- Re: [Qemu-devel] [PATCH V8 00/17] hw/pc: implement multiple primary busses for pc machines, Laszlo Ersek, 2015/06/03