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 fe371ff9aef8b738b6861c09fc5fd4068856eabd..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];
@@ -59,18 +59,24 @@ struct {
                        .phys_start = 0x37600000,
                        .size = 0x4000000,
                },
+               .debug_console = {
+                       .phys_start = 0x3f8,
+               },
                .platform_info.x86 = {
                        .mmconfig_base = 0xf8000000,
                        .mmconfig_end_bus = 0x3f,
                        .pm_timer_address = 0x408,
-
-                         .iommu_base = {
-                               0xfed90000,
-                               0xfed91000,
-                         },
-
+                       .iommu_units = {
+                               {
+                                       .base = 0xfed90000,
+                                       .size = 0x1000,
+                               },
+                               {
+                                       .base = 0xfed91000,
+                                       .size = 0x1000,
+                               },
+                       },
                },
-               .device_limit = 128,
                .interrupt_limit = 256,
                .root_cell = {
                        .name = "RootCell",
@@ -135,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,
                },
@@ -429,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,
                },
@@ -444,7 +450,9 @@ struct {
                {
                        .address = 0xfec00000,
                        .id = 0x1f0f8,
-                       .pin_bitmap = 0xffffff,
+                       .pin_bitmap = {
+                               0xffffff
+                       },
                },
        },
 
@@ -455,18 +463,18 @@ struct {
                [  0x60/8 ...   0x67/8] = 0xec, /* HACK: NMI status/control */
                [  0x68/8 ...   0x6f/8] = -1,
                [  0x70/8 ...   0x77/8] = 0xfc, /* RTC */
-               [  0x78/8 ...   0x7f/7] = -1,
+               [  0x78/8 ...   0x7f/8] = -1,
                [  0x80/8 ...   0x87/8] = 0xfe, /* Linux: native_io_delay() */
-               [  0x88/8 ...   0xec/8] = -1,
-               [  0xed/8 ...   0xf5/8] = 0xfe, /*port 0xed delay experimental*/                
-               [  0xf6/8 ...  0x2f7/8] = -1,
+               [  0x88/8 ...   0xe7/8] = -1,
+               [  0xe8/8 ...   0xef/8] = 0xdf, /*port 0xed delay experimental*/
+               [  0xf0/8 ...  0x2f7/8] = -1,
                [ 0x2f8/8 ...  0x2ff/8] = 0,/*serial 1*/
                [ 0x300/8 ...  0x3af/8] = -1,
-               [ 0x3b0/8 ...  0x3df/8] = 0x00, /* VGA */               
+               [ 0x3b0/8 ...  0x3df/8] = 0x00, /* VGA */
                [ 0x3e0/8 ...  0x3f7/8] = -1,
                [ 0x3f8/8 ...  0x3ff/8] = -1,/*serial 0*/
-               [ 0x400/8 ...  0xeff/8] = -1,           
-               [ 0xd00/8 ... 0xffff/8] = 0, /* HACK: PCI bus */
+               [ 0x400/8 ...  0xcff/8] = -1,
+               [ 0xd00/8 ... 0xffff/8] = 0, /* HACK: full PCI */
        },
 
        .pci_devices = {