| 修订版 | fb179055fe2344fb3a13e7c9638e51b5a159eae8 (tree) |
|---|---|
| 时间 | 2018-12-13 22:48:03 |
| 作者 | Edgar E. Iglesias <edgar.iglesias@xili...> |
| Commiter | Peter Maydell |
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>
hw/arm/xlnx-versal-virt.c (diff)
include/hw/arm/xlnx-versal.h (diff)| @@ -351,7 +351,7 @@ static void create_virtio_regions(VersalVirt *s) | ||
| 351 | 351 | for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) { |
| 352 | 352 | char *name = g_strdup_printf("virtio%d", i);; |
| 353 | 353 | hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size; |
| 354 | - int irq = VERSAL_RSVD_HIGH_IRQ_FIRST + i; | |
| 354 | + int irq = VERSAL_RSVD_IRQ_FIRST + i; | |
| 355 | 355 | MemoryRegion *mr; |
| 356 | 356 | DeviceState *dev; |
| 357 | 357 | qemu_irq pic_irq; |
| @@ -368,7 +368,7 @@ static void create_virtio_regions(VersalVirt *s) | ||
| 368 | 368 | |
| 369 | 369 | for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) { |
| 370 | 370 | hwaddr base = MM_TOP_RSVD + i * virtio_mmio_size; |
| 371 | - int irq = VERSAL_RSVD_HIGH_IRQ_FIRST + i; | |
| 371 | + int irq = VERSAL_RSVD_IRQ_FIRST + i; | |
| 372 | 372 | char *name = g_strdup_printf("/virtio_mmio@%" PRIx64, base); |
| 373 | 373 | |
| 374 | 374 | qemu_fdt_add_subnode(s->fdt, name); |
| @@ -75,9 +75,9 @@ typedef struct Versal { | ||
| 75 | 75 | #define VERSAL_GEM1_IRQ_0 58 |
| 76 | 76 | #define VERSAL_GEM1_WAKE_IRQ_0 59 |
| 77 | 77 | |
| 78 | -/* Architecturally eserved IRQs suitable for virtualization. */ | |
| 79 | -#define VERSAL_RSVD_HIGH_IRQ_FIRST 160 | |
| 80 | -#define VERSAL_RSVD_HIGH_IRQ_LAST 255 | |
| 78 | +/* Architecturally reserved IRQs suitable for virtualization. */ | |
| 79 | +#define VERSAL_RSVD_IRQ_FIRST 111 | |
| 80 | +#define VERSAL_RSVD_IRQ_LAST 118 | |
| 81 | 81 | |
| 82 | 82 | #define MM_TOP_RSVD 0xa0000000U |
| 83 | 83 | #define MM_TOP_RSVD_SIZE 0x4000000 |
Fork