Commit 0639b00d authored by Marcel Apfelbaum's avatar Marcel Apfelbaum Committed by Michael S. Tsirkin
Browse files

hw/pxb: add map_irq func 



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: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Acked-by: default avatarLaszlo Ersek <lersek@redhat.com>
parent 2118196b

hw/pci-bridge/pci_expander_bridge.c

+19 −1
Original line number Diff line number Diff line
@@ -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;