• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisãofb179055fe2344fb3a13e7c9638e51b5a159eae8 (tree)
Hora2018-12-13 22:48:03
AutorEdgar E. Iglesias <edgar.iglesias@xili...>
CommiterPeter Maydell

Mensagem de Log

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>

Mudança Sumário

Diff

--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -351,7 +351,7 @@ static void create_virtio_regions(VersalVirt *s)
351351 for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {
352352 char *name = g_strdup_printf("virtio%d", i);;
353353 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;
355355 MemoryRegion *mr;
356356 DeviceState *dev;
357357 qemu_irq pic_irq;
@@ -368,7 +368,7 @@ static void create_virtio_regions(VersalVirt *s)
368368
369369 for (i = 0; i < NUM_VIRTIO_TRANSPORT; i++) {
370370 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;
372372 char *name = g_strdup_printf("/virtio_mmio@%" PRIx64, base);
373373
374374 qemu_fdt_add_subnode(s->fdt, name);
--- a/include/hw/arm/xlnx-versal.h
+++ b/include/hw/arm/xlnx-versal.h
@@ -75,9 +75,9 @@ typedef struct Versal {
7575 #define VERSAL_GEM1_IRQ_0 58
7676 #define VERSAL_GEM1_WAKE_IRQ_0 59
7777
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
8181
8282 #define MM_TOP_RSVD 0xa0000000U
8383 #define MM_TOP_RSVD_SIZE 0x4000000