config, core: Improve irqchip configuration

[jailhouse.git] / configs / vexpress.c

diff --git a/configs/vexpress.c b/configs/vexpress.c
index 0d7d4a251d861a0940a8060fe8c1f72c8a0cbe9e..3caf3093ab13639a33d5e86239bd0338e64c376d 100644 (file)
--- a/configs/vexpress.c
+++ b/configs/vexpress.c
@@ -22,9 +22,15 @@ struct {
        struct jailhouse_irqchip irqchips[1];
 } __attribute__((packed)) config = {
        .header = {
+               .signature = JAILHOUSE_SYSTEM_SIGNATURE,
                .hypervisor_memory = {
-                       .phys_start = 0xa0000000,
-                       .size = 0x4000000 - 0x2000,
+                       .phys_start = 0xfc000000,
+                       .size = 0x4000000,
+               },
+               .debug_console = {
+                       .phys_start = 0x1c090000,
+                       .size = 0x1000,
+                       .flags = JAILHOUSE_MEM_IO,
                },
                .root_cell = {
                        .name = "VExpress Linux",
@@ -45,54 +51,54 @@ struct {
                        .virt_start = 0x1a000000,
                        .size = 0x00001000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_DMA,
+                               JAILHOUSE_MEM_IO,
                },
                /* SP810 */ {
                        .phys_start = 0x1c020000,
                        .virt_start = 0x1c020000,
                        .size = 0x00010000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_DMA,
+                               JAILHOUSE_MEM_IO,
                },
                /* MMC */ {
                        .phys_start = 0x1c050000,
                        .virt_start = 0x1c050000,
                        .size = 0x00001000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_DMA,
+                               JAILHOUSE_MEM_IO,
                },
                /* Mouse */ {
                        .phys_start = 0x1c070000,
                        .virt_start = 0x1c070000,
                        .size = 0x00010000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_DMA,
+                               JAILHOUSE_MEM_IO,
                },
                /* Keyboard */ {
                        .phys_start = 0x1c060000,
                        .virt_start = 0x1c060000,
                        .size = 0x00010000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_DMA,
+                               JAILHOUSE_MEM_IO,
                },
                /* UARTs */ {
                        .phys_start = 0x1c090000,
                        .virt_start = 0x1c090000,
                        .size = 0x00040000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_DMA,
+                               JAILHOUSE_MEM_IO,
                },
                /* Redistributors (ignore the mmio traps)*/ {
                        .phys_start = 0x2f100000,
                        .virt_start = 0x2f100000,
                        .size = 0x04000000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_DMA,
+                               JAILHOUSE_MEM_IO,
                },
                /* RAM */ {
                        .phys_start = 0x80000000,
                        .virt_start = 0x80000000,
-                       .size = 0x80000000,
+                       .size = 0x7c000000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE,
                },
@@ -100,7 +106,10 @@ struct {
        .irqchips = {
                /* GIC */ {
                        .address = 0x2f000000,
-                       .pin_bitmap = 0xffffffffffffffff,
+                       .pin_base = 32,
+                       .pin_bitmap = {
+                               0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff
+                       },
                },
        },