From 4d9d7b0fc155fd9c30784ec2b1896796086ba575 Mon Sep 17 00:00:00 2001 From: Anmol Date: Tue, 27 Jul 2021 22:15:00 +0200 Subject: meta-agl-jailhouse: Update the Jailhouse configuration files The current state and Information about the patch: - Updated Jailhouse root-cell(qemu-agl.c), apic-demo(agl-apic-demo.c), ivshmem-demo(agl-ivshmem-demo.c). - Jailhouse non-root cell(agl-linux-x86-demo.c) is also working, but need some more tweak for UART redirection. - Linux Kernel updated to the latest `queues/jailhouse` kernel branch. - Updated the `recipes-kernel` structure to a more custom one. - Updated conf/local.conf according to new `recipes-kernel` structure. - Removed the Linux Kernel patches from the `recipes-kernel` as updated kernel already contain those patches. This patch is the initial block for the virtio-blk support. v2 (Anmol): Add descriptive comments for serial in cell configuration files v3 (Anmol): Remove the ` IMAGE_INSTALL_append` and `EXTRA_IMAGE_FEATURES` from `50_local.conf.inc` v4 (Anmol): Minor changes in `50_local.conf.inc` v5 (jsmoeller): add meta-arm-toolchain to fix layer dependencies v6 (jsmoeller): remove linux-yocto_5.14%.bbappend v7 (Anmol): - Update the `SRCREV` for Jailhouse in `jailhous_git.bb` - Remove the patch `configs: arm64: Add support for RPi4 with more than 1G of memory` from `SRC_URI` in `jailhouse_git.bb` - Add the helper-scripts for the `runqemu-x86_64` and non-root linux cell. v8 (Anmol): Updated the `agl-ivshmem-demo.c`. v9 (Anmol): - Resolve build errors and update `jailhouse_git.bb`. - Add `PERF_forcevariable := "bash"` in `50_local.conf.inc`. v10 (Anmol): Disable perf build. v11 (jsmoeller): update qemu-agl.c to the 2G setup of runqemu after runtime test v12 (jsmoeller): add sample inmate tarball (to be used later) Change-Id: Idfa3e513488b5ecc8dfe9573f15c4b1c0edfd54f Signed-off-by: Anmol Signed-off-by: Jan-Simon Moeller --- .../recipes-extended/jailhouse/files/qemu-agl.c | 50 +++++++++++----------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'meta-agl-jailhouse/recipes-extended/jailhouse/files/qemu-agl.c') diff --git a/meta-agl-jailhouse/recipes-extended/jailhouse/files/qemu-agl.c b/meta-agl-jailhouse/recipes-extended/jailhouse/files/qemu-agl.c index cf193c08..d134e971 100644 --- a/meta-agl-jailhouse/recipes-extended/jailhouse/files/qemu-agl.c +++ b/meta-agl-jailhouse/recipes-extended/jailhouse/files/qemu-agl.c @@ -81,7 +81,7 @@ struct { }, }, .root_cell = { - .name = "RootCell", + .name = "AGL-Jailhouse-RootCell", .cpu_set_size = sizeof(config.cpus), .num_memory_regions = ARRAY_SIZE(config.mem_regions), .num_irqchips = ARRAY_SIZE(config.irqchips), @@ -104,35 +104,33 @@ struct { .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA, }, - /* MemRegion: 00100000-201fffff : System RAM */ + /* MemRegion: 000a0000-000bffff : PCI Bus 0000:00 */ { - .phys_start = 0x100000, - .virt_start = 0x100000, - .size = 0x20100000, - .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | - JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA, + .phys_start = 0xa0000, + .virt_start = 0xa0000, + .size = 0x20000, + .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE, }, - /* MemRegion: 20200000-21ffffff : Kernel */ + /* MemRegion: 000f0000-000fffff : System ROM */ { - .phys_start = 0x20200000, - .virt_start = 0x20200000, - .size = 0x1e00000, - .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | - JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA, + .phys_start = 0xf0000, + .virt_start = 0xf0000, + .size = 0x10000, + .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE, }, - /* MemRegion: 27200000-31ffffff : System RAM */ + /* MemRegion: 00100000-21ffffff : System RAM */ { - .phys_start = 0x27200000, - .virt_start = 0x27200000, - .size = 0xae00000, + .phys_start = 0x100000, + .virt_start = 0x100000, + .size = 0x21f00000, .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA, }, - /* MemRegion: 32000000-33ffffff : RAM buffer */ + /* MemRegion: 27200000-7ffd7fff : System RAM */ { - .phys_start = 0x32000000, - .virt_start = 0x32000000, - .size = 0x2000000, + .phys_start = 0x27200000, + .virt_start = 0x27200000, + .size = 0x58dd8000, .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA, }, @@ -178,7 +176,7 @@ struct { .size = 0x40000, .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE, }, - /* MemRegion: febd0000-febd3fff : ICH HD audio */ + /* MemRegion: febd0000-febd3fff : 0000:00:1b.0 */ { .phys_start = 0xfebd0000, .virt_start = 0xfebd0000, @@ -246,8 +244,8 @@ struct { PIO_RANGE(0x60, 0x1), /* Port I/O: 0064-0064 : keyboard */ PIO_RANGE(0x64, 0x1), - /* Port I/O: 0070-0077 : rtc0 */ - PIO_RANGE(0x70, 0x8), + /* Port I/O: 0070-0071 : rtc0 */ + PIO_RANGE(0x70, 0x2), /* Port I/O: 0080-008f : dma page reg */ /* PIO_RANGE(0x80, 0x10), */ /* Port I/O: 00a0-00a1 : pic2 */ @@ -258,10 +256,10 @@ struct { /* PIO_RANGE(0xf0, 0x10), */ /* Port I/O: 02f8-02ff : serial */ PIO_RANGE(0x2f8, 0x8), - /* Port I/O: 0378-037a : parport0 */ - /* PIO_RANGE(0x378, 0x3), */ /* Port I/O: 03c0-03df : vga+ */ PIO_RANGE(0x3c0, 0x20), + /* Port I/O: 03e8-03ef : serial */ + /* PIO_RANGE(0x3e8, 0x8), */ /* Port I/O: 03f8-03ff : serial */ PIO_RANGE(0x3f8, 0x8), /* Port I/O: 0510-051b : QEMU0002:00 */ -- cgit 1.2.3-korg