jailhouse: configs: Add bench cell configuration and tune novabox configuration accor...

[jailhouse.git] / configs / novabox.c

diff --git a/configs/novabox.c b/configs/novabox.c
index 43c3d8c4aeda22b4403515db224b14855bab0828..2bc9707cd87c301a40cc830ab76485d908cc67c1 100644 (file)
--- a/configs/novabox.c
+++ b/configs/novabox.c
@@ -36,7 +36,7 @@
  * created with '/usr/local/libexec/jailhouse/jailhouse config create -r . novabox.c'
  *
  * NOTE: This config expects the following to be appended to your kernel cmdline
- *       "memmap=0x7c00000$0x37600000"
+ *       "memmap=0x9000000$0x37600000"
  */
 
 #include <linux/types.h>
@@ -47,7 +47,7 @@
 struct {
        struct jailhouse_system header;
        __u64 cpus[1];
-       struct jailhouse_memory mem_regions[47];
+       struct jailhouse_memory mem_regions[46];
        struct jailhouse_irqchip irqchips[1];
        __u8 pio_bitmap[0x2000];
        struct jailhouse_pci_device pci_devices[16];
@@ -141,19 +141,19 @@ struct {
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
                },
-               /* MemRegion: 3f200000-40003fff : System RAM */
-               {
-                       .phys_start = 0x3f200000,
-                       .virt_start = 0x3f200000,
-                       .size = 0xe04000,
-                       .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-                               JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
-               },
-               /* MemRegion: 40005000-d9b4dfff : System RAM */
-               {
-                       .phys_start = 0x40005000,
-                       .virt_start = 0x40005000,
-                       .size = 0x99b49000,
+               // /* MemRegion: 3f200000-40003fff : System RAM */
+               // {
+               //      .phys_start = 0x3f200000,
+               //      .virt_start = 0x3f200000,
+               //      .size = 0xe04000,
+               //      .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
+               //              JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
+               // },
+               /* MemRegion: 0x40600000-d9b4dfff : System RAM */
+               {
+                       .phys_start = 0x40600000,
+                       .virt_start = 0x40600000,
+                       .size = 0x9954E000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
                },
@@ -435,11 +435,11 @@ struct {
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
                },
-               /* MemRegion: 3f000000-3f1fffff : JAILHOUSE Inmate Memory */
+               /* MemRegion: 0x3b600000-0x40600000 : JAILHOUSE Inmate Memory */
                {
                        .phys_start = 0x3b600000,
                        .virt_start = 0x3b600000,
-                       .size = 0x3C00000,
+                       .size = 0x5000000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
                                         JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
                },