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

DM: modify vE820 to adapt to pSRAM

Browse Source 
dm: modify vE820 to adapt to pSRAM for post-launched RTVM

When pSRAM is enabled for post-launched RTVM, we add a segment in vE820 for
pSRAM, and therefore the lowmem RAM will be split into part1 and part2.
Also, code of post vE820 initialization is refined

Tracked-On: #5330
Signed-off-by: Qian Wang <qian1.wang@intel.com>
This commit is contained in:
Qian Wang 2020-10-30 11:37:09 +08:00 committed by wenlingz
parent 2fdd1374a9
commit 46afb946da
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
devicemodel/core/sw_load_common.c
View File

@ -34,6 +34,7 @@
#include "sw_load.h" #include "sw_load.h"
#include "dm.h" #include "dm.h"
#include "pci_core.h" #include "pci_core.h"
#include "ptct.h"
int with_bootargs; int with_bootargs;
static char bootargs[BOOT_ARG_LEN]; static char bootargs[BOOT_ARG_LEN];
@ -50,12 +51,13 @@ static char bootargs[BOOT_ARG_LEN];
* map[0]:0~ctx->lowmem_limit & map[2]:4G~ctx->highmem for RAM * map[0]:0~ctx->lowmem_limit & map[2]:4G~ctx->highmem for RAM
* ctx->highmem = request_memory_size - ctx->lowmem_limit * ctx->highmem = request_memory_size - ctx->lowmem_limit
* *
* Begin Limit Type Length * Begin Limit Type Length
* 0: 0 - 0xA0000 RAM 0xA0000 * 0: 0 - 0xA0000 RAM 0xA0000
* 1: 0x100000 - lowmem RAM lowmem - 1MB * 1: 0x100000 - lowmem part1 RAM 0x0
* 2: lowmem - 0x80000000 (reserved) 2GB - lowmem * 2: pSRAM_bottom - pSRAM_top (reserved) pSRAM_MAX_SIZE
* 3: 0xE0000000 - 0x100000000 MCFG, MMIO 512MB * 3: lowmem part2 - 0x80000000 (reserved) 0x0
* 4: 0x140000000 - highmem RAM highmem - 5GB * 4: 0xE0000000 - 0x100000000 MCFG, MMIO 512MB
* 5: 0x140000000 - highmem RAM highmem - 5GB
* *
* FIXME: Do we need to reserve DSM and OPREGION for GVTD here. * FIXME: Do we need to reserve DSM and OPREGION for GVTD here.
*/ */
@ -66,15 +68,21 @@ const struct e820_entry e820_default_entries[NUM_E820_ENTRIES] = {
.type = E820_TYPE_RAM .type = E820_TYPE_RAM
}, },
{ /* 1MB to lowmem */ { /* 1MB to lowmem part1 */
.baseaddr = 0x100000, .baseaddr = 1 * MB,
.length = 0x48f00000, .length = 0x0,
.type = E820_TYPE_RAM .type = E820_TYPE_RAM
}, },
{ /* lowmem to lowmem_limit */ { /* pSRAM area */
.baseaddr = 0x49000000, .baseaddr = PSRAM_BASE_GPA,
.length = 0x37000000, .length = PSRAM_MAX_SIZE,
.type = E820_TYPE_RESERVED
},
{ /* lowmem part2 to lowmem_limit */
.baseaddr = PSRAM_BASE_GPA + PSRAM_MAX_SIZE,
.length = 0x0,
.type = E820_TYPE_RESERVED .type = E820_TYPE_RESERVED
}, },
@ -86,7 +94,7 @@ const struct e820_entry e820_default_entries[NUM_E820_ENTRIES] = {
{ /* 5GB to highmem */ { /* 5GB to highmem */
.baseaddr = PCI_EMUL_MEMLIMIT64, .baseaddr = PCI_EMUL_MEMLIMIT64,
.length = 0x000100000, .length = 0x0,
.type = E820_TYPE_RESERVED .type = E820_TYPE_RESERVED
}, },
}; };
@ -200,19 +208,21 @@ acrn_create_e820_table(struct vmctx *ctx, struct e820_entry *e820)
uint32_t removed = 0, k; uint32_t removed = 0, k;
memcpy(e820, e820_default_entries, sizeof(e820_default_entries)); memcpy(e820, e820_default_entries, sizeof(e820_default_entries));
e820[LOWRAM_E820_ENTRY].length = ctx->lowmem - if (ctx->lowmem <= e820[LOWRAM_E820_ENTRY+2].baseaddr) {
e820[LOWRAM_E820_ENTRY].baseaddr; e820[LOWRAM_E820_ENTRY].length =
(ctx->lowmem < e820[LOWRAM_E820_ENTRY+1].baseaddr ? ctx->lowmem :
e820[LOWRAM_E820_ENTRY+1].baseaddr) - e820[LOWRAM_E820_ENTRY].baseaddr;
/* remove [lowmem, lowmem_limit) if it's empty */ memmove(&e820[LOWRAM_E820_ENTRY+2], &e820[LOWRAM_E820_ENTRY+3],
if (ctx->lowmem_limit > ctx->lowmem) { sizeof(struct e820_entry) *
e820[LOWRAM_E820_ENTRY+1].baseaddr = ctx->lowmem; (NUM_E820_ENTRIES - (LOWRAM_E820_ENTRY+3)));
e820[LOWRAM_E820_ENTRY+1].length =
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++; removed++;
} else {
e820[LOWRAM_E820_ENTRY].length = e820[LOWRAM_E820_ENTRY+1].baseaddr -
e820[LOWRAM_E820_ENTRY].baseaddr;
e820[LOWRAM_E820_ENTRY+2].length =
(ctx->lowmem < ctx->lowmem_limit ? ctx->lowmem : ctx->lowmem_limit) -
e820[LOWRAM_E820_ENTRY+2].baseaddr;
} }
/* remove [5GB, highmem) if it's empty */ /* remove [5GB, highmem) if it's empty */

4
devicemodel/include/sw_load.h
View File

@ -39,9 +39,9 @@
#define E820_TYPE_ACPI_NVS 4U /* EFI 10 */ #define E820_TYPE_ACPI_NVS 4U /* EFI 10 */
#define E820_TYPE_UNUSABLE 5U /* EFI 8 */ #define E820_TYPE_UNUSABLE 5U /* EFI 8 */
#define NUM_E820_ENTRIES 5 #define NUM_E820_ENTRIES 6
#define LOWRAM_E820_ENTRY 1 #define LOWRAM_E820_ENTRY 1
#define HIGHRAM_E820_ENTRY 4 #define HIGHRAM_E820_ENTRY 5
/* Defines a single entry in an E820 memory map. */ /* Defines a single entry in an E820 memory map. */
struct e820_entry { struct e820_entry {