Commit fb179055 authored by Edgar E. Iglesias's avatar Edgar E. Iglesias Committed by Peter Maydell
Browse files

hw/arm: versal: Use IRQs 111 - 118 for virtio-mmio 



Use IRQs 111 - 118 for virtio-mmio. The interrupts we're currently
using 160+ are not available in the Versal GIC.

Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 20181129163655.20370-4-edgar.iglesias@gmail.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 7fd8115f

hw/arm/xlnx-versal-virt.c

+2 −2
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void create_virtio_regions(VersalVirt *s) 
    for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {

        char *name = g_strdup_printf("virtio%d", i);;

        hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size;

        int irq = VERSAL_RSVD_HIGH_IRQ_FIRST + i;

        int irq = VERSAL_RSVD_IRQ_FIRST + i;

        MemoryRegion *mr;

        DeviceState *dev;

        qemu_irq pic_irq;
@@ -368,7 +368,7 @@ static void create_virtio_regions(VersalVirt *s) 


    for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {

        hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size;

        int irq = VERSAL_RSVD_HIGH_IRQ_FIRST + i;

        int irq = VERSAL_RSVD_IRQ_FIRST + i;

        char *name = g_strdup_printf("/virtio_mmio@%" PRIx64, base);



        qemu_fdt_add_subnode(s->fdt, name);

include/hw/arm/xlnx-versal.h

+3 −3
Original line number Diff line number Diff line
@@ -75,9 +75,9 @@ typedef struct Versal { 
#define VERSAL_GEM1_IRQ_0          58

#define VERSAL_GEM1_WAKE_IRQ_0     59



/* Architecturally eserved IRQs suitable for virtualization.  */

#define VERSAL_RSVD_HIGH_IRQ_FIRST 160

#define VERSAL_RSVD_HIGH_IRQ_LAST  255

/* Architecturally reserved IRQs suitable for virtualization.  */

#define VERSAL_RSVD_IRQ_FIRST 111

#define VERSAL_RSVD_IRQ_LAST  118



#define MM_TOP_RSVD                 0xa0000000U

#define MM_TOP_RSVD_SIZE            0x4000000