ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20181129163655.20370-4-edgar.iglesias@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Edgar E. Iglesias 2018-12-13 13:48:03 +00:00 committed by Peter Maydell
parent 7fd8115f9d
commit fb179055fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm/xlnx-versal-virt.c
View File

@ -351,7 +351,7 @@ static void create_virtio_regions(VersalVirt *s)
for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) { for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {
char *name = g_strdup_printf("virtio%d", i);; char *name = g_strdup_printf("virtio%d", i);;
hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size; 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; MemoryRegion *mr;
DeviceState *dev; DeviceState *dev;
qemu_irq pic_irq; qemu_irq pic_irq;
@ -368,7 +368,7 @@ static void create_virtio_regions(VersalVirt *s)
for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) { for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {
hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size; 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); char *name = g_strdup_printf("/virtio_mmio@%" PRIx64, base);
qemu_fdt_add_subnode(s->fdt, name); qemu_fdt_add_subnode(s->fdt, name);

6
include/hw/arm/xlnx-versal.h
View File

@ -75,9 +75,9 @@ typedef struct Versal {
#define VERSAL_GEM1_IRQ_0 58 #define VERSAL_GEM1_IRQ_0 58
#define VERSAL_GEM1_WAKE_IRQ_0 59 #define VERSAL_GEM1_WAKE_IRQ_0 59
/* Architecturally eserved IRQs suitable for virtualization. */ /* Architecturally reserved IRQs suitable for virtualization. */
#define VERSAL_RSVD_HIGH_IRQ_FIRST 160 #define VERSAL_RSVD_IRQ_FIRST 111
#define VERSAL_RSVD_HIGH_IRQ_LAST 255 #define VERSAL_RSVD_IRQ_LAST 118
#define MM_TOP_RSVD 0xa0000000U #define MM_TOP_RSVD 0xa0000000U
#define MM_TOP_RSVD_SIZE 0x4000000 #define MM_TOP_RSVD_SIZE 0x4000000