From: Jan Kiszka <[email protected]> The SMMU is not managed by Jailhouse. No longer expose it to the root cell. Found by the config checker.
Signed-off-by: Jan Kiszka <[email protected]> --- configs/arm64/ultra96.c | 13 ++++++++++--- configs/arm64/zynqmp-zcu102.c | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/configs/arm64/ultra96.c b/configs/arm64/ultra96.c index 0387450d..b8829741 100644 --- a/configs/arm64/ultra96.c +++ b/configs/arm64/ultra96.c @@ -18,7 +18,7 @@ struct { struct jailhouse_system header; __u64 cpus[1]; - struct jailhouse_memory mem_regions[11]; + struct jailhouse_memory mem_regions[12]; struct jailhouse_irqchip irqchips[1]; struct jailhouse_pci_device pci_devices[2]; union jailhouse_stream_id stream_ids[2]; @@ -112,10 +112,17 @@ struct { }, /* IVSHMEM shared memory region for 00:01.0 */ JAILHOUSE_SHMEM_NET_REGIONS(0x7fb00000, 0), - /* MMIO (permissive) */ { + /* MMIO low (permissive) */ { .phys_start = 0xfd000000, .virt_start = 0xfd000000, - .size = 0x03000000, + .size = 0x00800000, + .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | + JAILHOUSE_MEM_IO, + }, + /* MMIO high (permissive) */ { + .phys_start = 0xfd820000, + .virt_start = 0xfd820000, + .size = 0x027e0000, .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_IO, }, diff --git a/configs/arm64/zynqmp-zcu102.c b/configs/arm64/zynqmp-zcu102.c index cd5f6089..750c9b6d 100644 --- a/configs/arm64/zynqmp-zcu102.c +++ b/configs/arm64/zynqmp-zcu102.c @@ -20,7 +20,7 @@ struct { struct jailhouse_system header; __u64 cpus[1]; - struct jailhouse_memory mem_regions[12]; + struct jailhouse_memory mem_regions[13]; struct jailhouse_irqchip irqchips[1]; struct jailhouse_pci_device pci_devices[2]; union jailhouse_stream_id stream_ids[3]; @@ -84,10 +84,17 @@ struct { JAILHOUSE_SHMEM_NET_REGIONS(0x800400000, 0), /* IVSHMEM shared memory region for 0001:00:01.0 */ JAILHOUSE_SHMEM_NET_REGIONS(0x800500000, 0), - /* MMIO (permissive) */ { + /* MMIO low (permissive) */ { .phys_start = 0xfd000000, .virt_start = 0xfd000000, - .size = 0x03000000, + .size = 0x00800000, + .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | + JAILHOUSE_MEM_IO, + }, + /* MMIO high (permissive) */ { + .phys_start = 0xfd820000, + .virt_start = 0xfd820000, + .size = 0x027e0000, .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_IO, }, -- 2.35.3 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/d049193ad6d7582d5f72f40da6b6fa7c1bfa2920.1674415741.git.jan.kiszka%40siemens.com.
