From: Jan Kiszka <[email protected]> The TX1 had an overlap of RAM and ivshmem. TX2 had the timer and the TOC_TKE (whatever that was) regions overlapping. According to the DT, the TOC_TKE is actually the timer region.
Signed-off-by: Jan Kiszka <[email protected]> --- configs/arm64/jetson-tx1.c | 2 +- configs/arm64/jetson-tx2.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/configs/arm64/jetson-tx1.c b/configs/arm64/jetson-tx1.c index 4c3320ff..8d1b9cc4 100644 --- a/configs/arm64/jetson-tx1.c +++ b/configs/arm64/jetson-tx1.c @@ -365,7 +365,7 @@ struct { /* System RAM */ { .phys_start = 0x80000000, .virt_start = 0x80000000, - .size = 0xfc000000, + .size = 0xfbf00000, .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_EXECUTE, }, diff --git a/configs/arm64/jetson-tx2.c b/configs/arm64/jetson-tx2.c index 28e7578c..c4078d90 100644 --- a/configs/arm64/jetson-tx2.c +++ b/configs/arm64/jetson-tx2.c @@ -24,7 +24,7 @@ struct { struct jailhouse_system header; __u64 cpus[1]; - struct jailhouse_memory mem_regions[61]; + struct jailhouse_memory mem_regions[60]; struct jailhouse_irqchip irqchips[3]; } __attribute__((packed)) config = { .header = { @@ -154,20 +154,13 @@ struct { .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_EXECUTE, }, - /* TOP_TKE */ { + /* TIMER */ { .phys_start = 0x03010000, .virt_start = 0x03010000, .size = 0xe0000, .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_EXECUTE, }, - /* TIMER */ { - .phys_start = 0x03020000, - .virt_start = 0x03020000, - .size = 0xa0000, - .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | - JAILHOUSE_MEM_EXECUTE, - }, /* UARTA */ { .phys_start = 0x03100000, .virt_start = 0x03100000, -- 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/78ddad527d7d0510d6b71fdb39bfb6f04ffa8fc5.1674415741.git.jan.kiszka%40siemens.com.
