From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Sun, 8 May 2016 09:55:46 +0000 (+0200)
Subject: jailhouse: configs: Change reserved memory layout for jailhouse, so configs have... 
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/jailhouse.git/commitdiff_plain/11dff97feece0823144bbe800b9e56c6995cd2fb?hp=2d2e6c0e93fdf71ceac031096ef9ff71958231fb

jailhouse: configs: Change reserved memory layout for jailhouse, so configs have to be changed.
---

diff --git a/configs/fiasco-demo.c b/configs/fiasco-demo.c
index 1414995..d7e9e6f 100755
--- a/configs/fiasco-demo.c
+++ b/configs/fiasco-demo.c
@@ -46,17 +46,17 @@ struct {
 		/* low RAM */ {
 			.phys_start = 0x3b600000,
 			.virt_start = 0,
-			.size = 0x3bff000,
+			.size = 0x3c00000,
 			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
 				JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA |
 				JAILHOUSE_MEM_LOADABLE,
 		},
 		
-		/* MemRegion: fee00000-feefffff : localAPIC */
+		/* MemRegion: fec00000-fecfffff : localAPIC */
 		{
-			.phys_start = 0xfee00000,
-			.virt_start = 0xfee00000,
-			.size = 0x100000,
+			.phys_start = 0xfec00000,
+			.virt_start = 0xfec00000,
+			.size = 0x10000,
 			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_DMA,
 		},
 	},
@@ -74,9 +74,9 @@ struct {
 		[  0x89/8 ...   0x99/8] = -1,
 		[  0xA0/8 ...   0xA8/8] = 0xfc, /* PIC Slave 0xA0 0xA1 */
 		[ 0xA9/8  ...  0x3f7/8] = -1,
-		[ 0x3f8/8 ...  0x3ff/8] = 0, /* serial1 */
+		[ 0x3f8/8 ...  0x3ff/8] = 0, /* serial0 */
 		[ 0x400/8 ... 0xe00f/8] = -1,
-		[0xe010/8 ... 0xe017/8] = 0, /* OXPCIe952 serial1 */
+		[0xe010/8 ... 0xe017/8] = -1, /* OXPCIe952 serial1 */
 		[0xe018/8 ... 0xffff/8] = -1,
 	},
 
diff --git a/configs/hpet-inmate-config.c b/configs/hpet-inmate-config.c
index 553be63..96ec18c 100755
--- a/configs/hpet-inmate-config.c
+++ b/configs/hpet-inmate-config.c
@@ -90,7 +90,7 @@ struct {
 		[     0/8 ...  0x3f7/8] = -1,
 		[ 0x3f8/8 ...  0x3ff/8] = 0, /* serial1 */
 		[ 0x400/8 ... 0xe00f/8] = -1,
-		[0xe010/8 ... 0xe017/8] = 0, /* OXPCIe952 serial1 */
+		[0xe010/8 ... 0xe017/8] = -1, /* OXPCIe952 serial1 */
 		[0xe018/8 ... 0xffff/8] = -1,
 	},
 };
\ No newline at end of file
diff --git a/configs/novabox.c b/configs/novabox.c
index 5b86e36..05ae7f3 100644
--- 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=0x4200000$0x3b000000"
+ *       "memmap=0x7c00000$0x37600000"
  */
 
 #include <linux/types.h>
@@ -56,7 +56,7 @@ struct {
 	.header = {
 		.signature = JAILHOUSE_SYSTEM_SIGNATURE,
 		.hypervisor_memory = {
-			.phys_start = 0x3b000000,
+			.phys_start = 0x37600000,
 			.size = 0x4000000,
 		},
 		.platform_info.x86 = {
@@ -125,11 +125,11 @@ struct {
 			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
 				JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
 		},
-		/* MemRegion: 20200000-3affffff : System RAM */
+		/* MemRegion: 20200000-375fffff : System RAM */
 		{
 			.phys_start = 0x20200000,
 			.virt_start = 0x20200000,
-			.size = 0x1ae00000,
+			.size = 0x17400000,
 			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
 				JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
 		},
@@ -413,10 +413,11 @@ struct {
 		},
 		/* MemRegion: 3f000000-3f1fffff : JAILHOUSE Inmate Memory */
 		{
-			.phys_start = 0x3f000000,
-			.virt_start = 0x3f000000,
-			.size = 0x200000,
-			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+			.phys_start = 0x3b600000,
+			.virt_start = 0x3b600000,
+			.size = 0x3C00000,
+			.flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
+					 JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA,
 		},
 	},
 
@@ -445,7 +446,7 @@ struct {
 		[ 0x300/8 ...  0x3af/8] = -1,
 		[ 0x3b0/8 ...  0x3df/8] = 0x00, /* VGA */		
 		[ 0x3e0/8 ...  0x3f7/8] = -1,
-		[ 0x3f8/8 ...  0x3ff/8] = 0,/*serial 0*/
+		[ 0x3f8/8 ...  0x3ff/8] = -1,/*serial 0*/
 		[ 0x400/8 ...  0xeff/8] = -1,		
 		[ 0xd00/8 ... 0xffff/8] = 0, /* HACK: PCI bus */
 	},