github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-07 12:29:48 +00:00
Code Issues Projects Releases Wiki Activity

dm: update the vsbl loader

Browse Source 
to use new interface to set the state of guest BSP (entries, general
registers etc) when DM load vsbl.

Tracked-On: #1231
Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yin Fengwei 2018-08-27 20:00:52 +08:00 committed by wenlingz
parent 853b1c74cb
commit 96d999544c
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
devicemodel/core/sw_load_vsbl.c
View File

@ -247,13 +247,8 @@ acrn_sw_load_vsbl(struct vmctx *ctx)
int ret; int ret;
struct e820_entry *e820; struct e820_entry *e820;
struct vsbl_para *vsbl_para; struct vsbl_para *vsbl_para;
uint64_t *vsbl_entry =
(uint64_t *)(ctx->baseaddr + VSBL_ENTRY_OFF(ctx));
uint64_t *cfg_offset =
(uint64_t *)(ctx->baseaddr + GUEST_CFG_OFFSET);
init_cmos_vrpmb(ctx); init_cmos_vrpmb(ctx);
*cfg_offset = ctx->lowmem;
vsbl_para = (struct vsbl_para *) vsbl_para = (struct vsbl_para *)
(ctx->baseaddr + CONFIGPAGE_OFF(ctx)); (ctx->baseaddr + CONFIGPAGE_OFF(ctx));
@ -297,12 +292,24 @@ acrn_sw_load_vsbl(struct vmctx *ctx)
vsbl_para->e820_entries = add_e820_entry(e820, vsbl_para->e820_entries, vsbl_para->e820_entries = add_e820_entry(e820, vsbl_para->e820_entries,
vsbl_para->vsbl_address, vsbl_size, E820_TYPE_RESERVED); vsbl_para->vsbl_address, vsbl_size, E820_TYPE_RESERVED);
printf("SW_LOAD: vsbl_entry 0x%lx\n", VSBL_TOP(ctx) - 16);
*vsbl_entry = VSBL_TOP(ctx) - 16; /* reset vector */
printf("SW_LOAD: vsbl_entry 0x%lx\n", *vsbl_entry);
vsbl_para->boot_device_address = boot_blk_bdf; vsbl_para->boot_device_address = boot_blk_bdf;
vsbl_para->trusty_enabled = trusty_enabled; vsbl_para->trusty_enabled = trusty_enabled;
/* set guest bsp state. Will call hypercall set bsp state
* after bsp is created.
*/
memset(&ctx->bsp_regs, 0, sizeof( struct acrn_set_vcpu_regs));
ctx->bsp_regs.vcpu_id = 0;
/* CR0_ET | CR0_NE */
ctx->bsp_regs.vcpu_regs.cr0 = 0x30U;
ctx->bsp_regs.vcpu_regs.cs_ar = 0x009FU;
ctx->bsp_regs.vcpu_regs.cs_sel = 0xF000U;
ctx->bsp_regs.vcpu_regs.cs_base = (VSBL_TOP(ctx) - 16) &0xFFFF0000UL;
ctx->bsp_regs.vcpu_regs.rip = (VSBL_TOP(ctx) - 16) & 0xFFFFUL;
ctx->bsp_regs.vcpu_regs.gprs.rsi = CONFIGPAGE_OFF(ctx);
return 0; return 0;
} }