From d3a640da92ec57031639574e09d9096ed4d21f4b Mon Sep 17 00:00:00 2001
From: Yin Fengwei <fengwei.yin@intel.com>
Date: Wed, 4 Apr 2018 16:01:25 +0800
Subject: [PATCH] DM: add add_e820_entry to update e820 table.

For vSBL boot path, we need to mark the memory vSBL is using
as reserved in e820 table. The add_e820_entry is added to
update the e820 table dynamically.

To simplify the code logic, we assume:
  - vSBL is put the middle of one entry of default e820 table
  - That entry has orignal RAM type in e820 table
  - The e820 table has enough space to hold two more new entries.

If there is more complicated case in the future, we could extend
add_e820_entry to handle it.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
---
 devicemodel/core/sw_load_common.c | 59 +++++++++++++++++++++++++++++--
 devicemodel/core/sw_load_vsbl.c   |  4 +++
 devicemodel/include/sw_load.h     |  2 ++
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/devicemodel/core/sw_load_common.c b/devicemodel/core/sw_load_common.c
index 257d3235d..27131f6cf 100644
--- a/devicemodel/core/sw_load_common.c
+++ b/devicemodel/core/sw_load_common.c
@@ -132,6 +132,61 @@ check_image(char *path)
 	return 0;
 }
 
+/* Assumption:
+ * the range [start, start + size] belongs to one entry of e820 table
+ */
+int
+add_e820_entry(struct e820_entry *e820, int len, uint64_t start,
+	uint64_t size, uint32_t type)
+{
+	int i, length = len;
+	uint64_t e_s, e_e;
+
+	for (i = 0; i < len; i++) {
+		e_s = e820[i].baseaddr;
+		e_e = e820[i].baseaddr + e820[i].length;
+		if ((e_s <= start) && ((start + size) <= e_e)) {
+			int index_s = 0, index_e = 3;
+			uint64_t pt[4];
+			uint32_t pt_t[3];
+
+			pt[0] = e_s;
+			pt[1] = start;
+			pt[2] = start + size;
+			pt[3] = e_e;
+
+			pt_t[0] = e820[i].type;
+			pt_t[1] = type;
+			pt_t[2] = e820[i].type;
+
+			if (e_s == start) {
+				index_s = 1;
+			}
+
+			if (e_e == (start + size)) {
+				index_e = 2;
+			}
+			length += index_e - index_s - 1;
+
+			if ((i != (len - 1) && ((index_e - index_s) > 1))) {
+				memmove(&e820[i + index_e - index_s],
+					&e820[i + 1], (len - i - 1) *
+					sizeof(struct e820_entry));
+			}
+
+			for (; index_s < index_e; index_s++, i++) {
+				e820[i].baseaddr = pt[index_s];
+				e820[i].length = pt[index_s + 1] - pt[index_s];
+				e820[i].type = pt_t[index_s];
+			}
+
+			break;
+		}
+	}
+
+	return length;
+}
+
 uint32_t
 acrn_create_e820_table(struct vmctx *ctx, struct e820_entry *e820)
 {
@@ -152,12 +207,12 @@ acrn_create_e820_table(struct vmctx *ctx, struct e820_entry *e820)
 		e820[HIGHRAM_E820_ENTRIES].length = ctx->highmem;
 	}
 
-	printf("SW_LOAD: build e820 %d entries to addr: %p\n",
+	printf("SW_LOAD: build e820 %d entries to addr: %p\r\n",
 			NUM_E820_ENTRIES, (void *)e820);
 
 	for (k = 0; k < NUM_E820_ENTRIES; k++)
 		printf("SW_LOAD: entry[%d]: addr 0x%016lx, size 0x%016lx, "
-				" type 0x%x\n",
+				" type 0x%x\r\n",
 				k, e820[k].baseaddr,
 				e820[k].length,
 				e820[k].type);
diff --git a/devicemodel/core/sw_load_vsbl.c b/devicemodel/core/sw_load_vsbl.c
index fb1566687..fec53cf23 100644
--- a/devicemodel/core/sw_load_vsbl.c
+++ b/devicemodel/core/sw_load_vsbl.c
@@ -279,6 +279,10 @@ acrn_sw_load_vsbl(struct vmctx *ctx)
 
 	vsbl_para->vsbl_address = VSBL_OFF(ctx);
 	vsbl_para->vsbl_size = vsbl_size;
+
+	vsbl_para->e820_entries = add_e820_entry(e820, vsbl_para->e820_entries,
+		vsbl_para->vsbl_address, vsbl_size, E820_TYPE_RESERVED);
+
 	*vsbl_entry = *((uint32_t *) vsbl_start_addr);
 
 	vsbl_para->boot_device_address = boot_blk_bdf;
diff --git a/devicemodel/include/sw_load.h b/devicemodel/include/sw_load.h
index 6082296b3..3c2d9db1b 100644
--- a/devicemodel/include/sw_load.h
+++ b/devicemodel/include/sw_load.h
@@ -70,6 +70,8 @@ void vsbl_set_bdf(int bnum, int snum, int fnum);
 
 int check_image(char *path);
 uint32_t acrn_create_e820_table(struct vmctx *ctx, struct e820_entry *e820);
+int add_e820_entry(struct e820_entry *e820, int len, uint64_t start,
+	uint64_t size, uint32_t type);
 
 int acrn_sw_load_bzimage(struct vmctx *ctx);
 int acrn_sw_load_vsbl(struct vmctx *ctx);