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

Revert "hv: Make bsp could start from real mode"

Browse Source 
This reverts commit 1e8006bca1.
This commit is contained in:
lijinxia 2018-06-27 14:20:23 +08:00
parent 7ab3c2a1ac
commit 9b9f5c4612
1 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
hypervisor/arch/x86/vmx.c
View File

@ -525,34 +525,13 @@ static void init_guest_state(struct vcpu *vcpu)
/***************************************************/ /***************************************************/
if (vcpu_mode == CPU_MODE_REAL) { if (vcpu_mode == CPU_MODE_REAL) {
if (is_vcpu_bsp(vcpu)) { if (is_vcpu_bsp(vcpu)) {
/* There are two cases that we will start bsp in real ASSERT(!is_vm0(vcpu->vm),
* mode: "VM0 bsp should not be inited as realmode");
* 1. UOS start /* BP is initialized with real mode */
* 2. SOS resume from S3
*
* For 1, DM will set correct entry_addr.
* For 2, SOS resume caller will set entry_addr to
* SOS wakeup vec. According to ACPI FACS spec,
* wakeup vec should be < 1MB. So we use < 1MB
* to detect whether it's resume from S3 and we
* setup CS:IP to
* (wakeup_vec >> 4):(wakeup_vec & 0x000F)
* if it's resume from S3.
*
*/
if ((uint64_t)vcpu->entry_addr < 0x100000) {
sel =((uint64_t)vcpu->entry_addr & 0xFFFF0)
>> 4;
base = sel << 4;
} else {
/* BSP is initialized with real mode */
sel = REAL_MODE_BSP_INIT_CODE_SEL; sel = REAL_MODE_BSP_INIT_CODE_SEL;
/* For unrestricted guest, it is able /* For unrestricted guest, it is able to set a
* to set a high base address * high base address */
*/ base = (uint64_t)vcpu->entry_addr & 0xFFFF0000UL;
base = (uint64_t)vcpu->entry_addr &
0xFFFF0000UL;
}
} else { } else {
/* AP is initialized with real mode /* AP is initialized with real mode
* and CS value is left shift 8 bits from sipi vector; * and CS value is left shift 8 bits from sipi vector;
@ -599,16 +578,12 @@ static void init_guest_state(struct vcpu *vcpu)
/***************************************************/ /***************************************************/
/* Set up guest instruction pointer */ /* Set up guest instruction pointer */
field = VMX_GUEST_RIP; field = VMX_GUEST_RIP;
value32 = 0; if (vcpu_mode == CPU_MODE_REAL)
if (vcpu_mode == CPU_MODE_REAL) { if (is_vcpu_bsp(vcpu))
/* RIP is set here */
if (is_vcpu_bsp(vcpu)) {
if ((uint64_t)vcpu->entry_addr < 0x100000)
value32 = (uint64_t)vcpu->entry_addr & 0x0F;
else
value32 = 0x0000FFF0; value32 = 0x0000FFF0;
} else
} else value32 = 0;
else
value32 = (uint32_t)((uint64_t)vcpu->entry_addr); value32 = (uint32_t)((uint64_t)vcpu->entry_addr);
pr_dbg("GUEST RIP on VMEntry %x ", value32); pr_dbg("GUEST RIP on VMEntry %x ", value32);