github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-08 11:39:39 +00:00
Code Issues Projects Releases Wiki Activity

dm: remove empty UOS E820 entries

Browse Source 
While building the E820 map for UOS, [lowmem, lowmem_limit) and [5GB,
highmem) can be empty. Remove the empty entries if they appear.

Tracked-On: #2792
Signed-off-by: Peter Fang <peter.fang@intel.com>
Reviewed-by: Eddie Dong <eddie.dong@intel.com>
Acked-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Peter Fang 2019-03-15 02:23:55 -07:00 committed by wenlingz
parent 643513f3d4
commit 4dd1331072
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
devicemodel/core/sw_load_common.c
View File

@ -211,34 +211,45 @@ add_e820_entry(struct e820_entry *e820, int len, uint64_t start,
uint32_t uint32_t
acrn_create_e820_table(struct vmctx *ctx, struct e820_entry *e820) acrn_create_e820_table(struct vmctx *ctx, struct e820_entry *e820)
{ {
uint32_t k; uint32_t removed = 0, k;
memcpy(e820, e820_default_entries, sizeof(e820_default_entries)); memcpy(e820, e820_default_entries, sizeof(e820_default_entries));
if (ctx->lowmem > 0) { assert(ctx->lowmem > e820[LOWRAM_E820_ENTRY].baseaddr);
e820[LOWRAM_E820_ENTRIES].length = ctx->lowmem - e820[LOWRAM_E820_ENTRY].length = ctx->lowmem -
e820[LOWRAM_E820_ENTRIES].baseaddr; e820[LOWRAM_E820_ENTRY].baseaddr;
e820[LOWRAM_E820_ENTRIES+1].baseaddr = ctx->lowmem;
e820[LOWRAM_E820_ENTRIES+1].length = /* remove [lowmem, lowmem_limit) if it's empty */
if (ctx->lowmem_limit > ctx->lowmem) {
e820[LOWRAM_E820_ENTRY+1].baseaddr = ctx->lowmem;
e820[LOWRAM_E820_ENTRY+1].length =
ctx->lowmem_limit - ctx->lowmem; ctx->lowmem_limit - ctx->lowmem;
} else {
memmove(&e820[LOWRAM_E820_ENTRY+1], &e820[LOWRAM_E820_ENTRY+2],
sizeof(e820[LOWRAM_E820_ENTRY+2]) *
(NUM_E820_ENTRIES - (LOWRAM_E820_ENTRY+2)));
removed++;
} }
/* remove [5GB, highmem) if it's empty */
if (ctx->highmem > 0) { if (ctx->highmem > 0) {
e820[HIGHRAM_E820_ENTRIES].type = E820_TYPE_RAM; e820[HIGHRAM_E820_ENTRY - removed].type = E820_TYPE_RAM;
e820[HIGHRAM_E820_ENTRIES].length = ctx->highmem; e820[HIGHRAM_E820_ENTRY - removed].length = ctx->highmem;
} else {
removed++;
} }
printf("SW_LOAD: build e820 %d entries to addr: %p\r\n", printf("SW_LOAD: build e820 %d entries to addr: %p\r\n",
NUM_E820_ENTRIES, (void *)e820); NUM_E820_ENTRIES - removed, (void *)e820);
for (k = 0; k < NUM_E820_ENTRIES; k++) for (k = 0; k < NUM_E820_ENTRIES - removed; k++)
printf("SW_LOAD: entry[%d]: addr 0x%016lx, size 0x%016lx, " printf("SW_LOAD: entry[%d]: addr 0x%016lx, size 0x%016lx, "
" type 0x%x\r\n", " type 0x%x\r\n",
k, e820[k].baseaddr, k, e820[k].baseaddr,
e820[k].length, e820[k].length,
e820[k].type); e820[k].type);
return NUM_E820_ENTRIES; return (NUM_E820_ENTRIES - removed);
} }
int int

4
devicemodel/include/sw_load.h
View File

@ -39,8 +39,8 @@
#define E820_TYPE_UNUSABLE 5 /* EFI 8 */ #define E820_TYPE_UNUSABLE 5 /* EFI 8 */
#define NUM_E820_ENTRIES 7 #define NUM_E820_ENTRIES 7
#define LOWRAM_E820_ENTRIES 2 #define LOWRAM_E820_ENTRY 2
#define HIGHRAM_E820_ENTRIES 6 #define HIGHRAM_E820_ENTRY 6
/* Defines a single entry in an E820 memory map. */ /* Defines a single entry in an E820 memory map. */
struct e820_entry { struct e820_entry {