Commit 01b96ec8 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Peter Maydell
Browse files

i.mx7d: pci: Update PCI IRQ mapping to match HW 



Datasheet for i.MX7 is incorrect and i.MX7's PCI IRQ mapping matches
that of i.MX6:

    * INTD/MSI    122
    * INTC        123
    * INTB        124
    * INTA        125

Fix all of the relevant code to reflect that fact. Needed by latest
Linux kernels.

(Reference: Linux kernel commit 538d6e9d597584e80 from an
NXP employee confirming that the datasheet is incorrect and
with a report of a test against hardware.)

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
[PMM: added ref to kernel commit confirming the datasheet error]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 97b7e29b

hw/pci-host/designware.c

+4 −2
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#define DESIGNWARE_PCIE_ATU_DEVFN(x)               (((x) >> 16) & 0xff)

#define DESIGNWARE_PCIE_ATU_UPPER_TARGET           0x91C



#define DESIGNWARE_PCIE_IRQ_MSI                    3



static DesignwarePCIEHost *

designware_pcie_root_to_host(DesignwarePCIERoot *root)

{
@@ -67,7 +69,7 @@ static void designware_pcie_root_msi_write(void *opaque, hwaddr addr, 
    root->msi.intr[0].status |= BIT(val) & root->msi.intr[0].enable;



    if (root->msi.intr[0].status & ~root->msi.intr[0].mask) {

        qemu_set_irq(host->pci.irqs[0], 1);

        qemu_set_irq(host->pci.irqs[DESIGNWARE_PCIE_IRQ_MSI], 1);

    }

}
@@ -311,7 +313,7 @@ static void designware_pcie_root_config_write(PCIDevice *d, uint32_t address, 
    case DESIGNWARE_PCIE_MSI_INTR0_STATUS:

        root->msi.intr[0].status ^= val;

        if (!root->msi.intr[0].status) {

            qemu_set_irq(host->pci.irqs[0], 0);

            qemu_set_irq(host->pci.irqs[DESIGNWARE_PCIE_IRQ_MSI], 0);

        }

        break;

include/hw/arm/fsl-imx7.h

+4 −4
Original line number Diff line number Diff line
@@ -213,10 +213,10 @@ enum FslIMX7IRQs { 
    FSL_IMX7_USB2_IRQ     = 42,

    FSL_IMX7_USB3_IRQ     = 40,



    FSL_IMX7_PCI_INTA_IRQ = 122,

    FSL_IMX7_PCI_INTB_IRQ = 123,

    FSL_IMX7_PCI_INTC_IRQ = 124,

    FSL_IMX7_PCI_INTD_IRQ = 125,

    FSL_IMX7_PCI_INTA_IRQ = 125,

    FSL_IMX7_PCI_INTB_IRQ = 124,

    FSL_IMX7_PCI_INTC_IRQ = 123,

    FSL_IMX7_PCI_INTD_IRQ = 122,



    FSL_IMX7_UART7_IRQ    = 126,