configs: Rearrange default locations of hypervisor and demo inmates

Move the inmates after the hypervisor in memory and use a default
location that works well both in QEMU and on most tested hardware.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/README b/README
index a22d88bd6e3bd945e71f62e0bca4a1102d96a5ff..1e60ecd83a33807bd8e8516aa5b75d677b2137a3 100644 (file)
--- a/README
+++ b/README
@@ -111,7 +111,7 @@ The hypervisor requires a contiguous piece of RAM for itself and each
 additional cell. This currently has to be pre-allocated during boot-up. So you
 need to add
 
-    memmap=66M$0x3be00000
+    memmap=66M$0x3b000000
 
 as parameter to the command line of the virtual machine's kernel. Reboot the
 guest and load jailhouse.ko. Then enable Jailhouse like this:

diff --git a/configs/apic-demo.c b/configs/apic-demo.c
index 3e51d62e1cf32b02c5888e415d220fd643ea8373..046a7826cc50f6e9cadacdc1a9433e586bf11072 100644 (file)
--- a/configs/apic-demo.c
+++ b/configs/apic-demo.c
@@ -39,7 +39,7 @@ struct {
 
        .mem_regions = {
                /* RAM */ {
-                       .phys_start = 0x3bf00000,
+                       .phys_start = 0x3f000000,
                        .virt_start = 0,
                        .size = 0x00100000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |

diff --git a/configs/h87i.c b/configs/h87i.c
index cf0024f23ea6ad25cea6c8bc182b25f9a7931528..92b1989ada1d6c1fc5dae966092afa4077f56cf3 100644 (file)
--- a/configs/h87i.c
+++ b/configs/h87i.c
@@ -28,7 +28,7 @@ struct {
 } __attribute__((packed)) config = {
        .header = {
                .hypervisor_memory = {
-                       .phys_start = 0x3c000000,
+                       .phys_start = 0x3b000000,
                        .size = 0x4000000,
                },
                .platform_info.x86 = {
@@ -61,14 +61,14 @@ struct {
                /* RAM */ {
                        .phys_start = 0x0,
                        .virt_start = 0x0,
-                       .size = 0x3c000000,
+                       .size = 0x3b000000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
                },
                /* RAM */ {
-                       .phys_start = 0x40000000,
-                       .virt_start = 0x40000000,
-                       .size = 0x8ca64000,
+                       .phys_start = 0x3f000000,
+                       .virt_start = 0x3f000000,
+                       .size = 0x8da64000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
                },

diff --git a/configs/ioapic-demo.c b/configs/ioapic-demo.c
index 1a4315ed48b3d6010de28ac0f0c5f9e2a0289909..40e43f2bb5ba0ca39c140cae311fdd66bf228c39 100644 (file)
--- a/configs/ioapic-demo.c
+++ b/configs/ioapic-demo.c
@@ -42,7 +42,7 @@ struct {
 
        .mem_regions = {
                /* RAM */ {
-                       .phys_start = 0x3be00000,
+                       .phys_start = 0x3f100000,
                        .virt_start = 0,
                        .size = 0x00100000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |

diff --git a/configs/pci-demo.c b/configs/pci-demo.c
index 09b9447c47f0942f4d0e366de9261b7e611bb9f8..9449aac1fbf376cf3f0a4d7fcedc7ed371664ec3 100644 (file)
--- a/configs/pci-demo.c
+++ b/configs/pci-demo.c
@@ -44,7 +44,7 @@ struct {
 
        .mem_regions = {
                /* RAM */ {
-                       .phys_start = 0x3be00000,
+                       .phys_start = 0x3f100000,
                        .virt_start = 0,
                        .size = 0x00100000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |

diff --git a/configs/qemu-vm.c b/configs/qemu-vm.c
index e1e9c66c4143944e888a4f5c6c6b5c737c3aa395..8e5f0df886336a23f36e95ddb1fe2021ed31a74c 100644 (file)
--- a/configs/qemu-vm.c
+++ b/configs/qemu-vm.c
@@ -25,7 +25,7 @@
 struct {
        struct jailhouse_system header;
        __u64 cpus[1];
-       struct jailhouse_memory mem_regions[10];
+       struct jailhouse_memory mem_regions[11];
        struct jailhouse_irqchip irqchips[1];
        __u8 pio_bitmap[0x2000];
        struct jailhouse_pci_device pci_devices[7];
@@ -33,8 +33,8 @@ struct {
 } __attribute__((packed)) config = {
        .header = {
                .hypervisor_memory = {
-                       .phys_start = 0x3c000000,
-                       .size = 0x4000000 - 0x30000,
+                       .phys_start = 0x3b000000,
+                       .size = 0x4000000,
                },
                .platform_info.x86 = {
                        .mmconfig_base = 0xb0000000,
@@ -65,7 +65,14 @@ struct {
                /* RAM */ {
                        .phys_start = 0x0,
                        .virt_start = 0x0,
-                       .size = 0x3c000000,
+                       .size = 0x3b000000,
+                       .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
+                               JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
+               },
+               /* RAM */ {
+                       .phys_start = 0x3f000000,
+                       .virt_start = 0x3f000000,
+                       .size = 0xfdf000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
                },

diff --git a/configs/tiny-demo.c b/configs/tiny-demo.c
index d4eb2ba2883cb87f884a6c35e46f43efc0dc607e..355a330c8fa417dfaff27915175ec46d0c19f93a 100644 (file)
--- a/configs/tiny-demo.c
+++ b/configs/tiny-demo.c
@@ -40,7 +40,7 @@ struct {
 
        .mem_regions = {
                /* RAM */ {
-                       .phys_start = 0x3be00000,
+                       .phys_start = 0x3f100000,
                        .virt_start = 0,
                        .size = 0x00100000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |