github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-24 10:17:28 +00:00
Code Issues Projects Releases Wiki Activity

hv: don't combine the trampline code with AP start

Browse Source 
Cleanup "cpu_secondary_xx" in the symbols/section/functions/variables
name in trampline code.

There is item left: the default C entry is Ap start c entry. Before
ACRN enter S3, the c entry will be updated to high level S3 C entry.
So s3 resume will go s3 resume path instead of AP startup path.

Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Signed-off-by: Zheng Gen <gen.zheng@intel.com>
Acked-by: Anthony Xu <anthony.xu@intel.com>
Acked-by: Eddie Dong <Eddie.dong@intel.com>
This commit is contained in:
Yin Fengwei
2018-06-07 12:20:56 +08:00
committed by lijinxia
parent 11df803da3
commit f3831cdc80
5 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hypervisor/arch/x86/guest/guest.c
View File

@@ -573,10 +573,10 @@ int prepare_vm0_memmap_and_e820(struct vm *vm)
* FIXME: here using hard code GUEST_INIT_PAGE_TABLE_START as guest init page
* table gpa start, and it will occupy at most GUEST_INIT_PT_PAGE_NUM pages.
* Some check here:
* - guest page table space should not override cpu_secondary_reset code area
* - guest page table space should not override trampline code area
* (it's a little tricky here, as under current identical mapping, HV & SOS
* share same memory under 1M; under uefi boot mode, the defered AP startup
* need cpu_secondary_reset code area which reserved by uefi stub keep there
* need trampline code area which reserved by uefi stub keep there
* no change even after SOS startup)
* - guest page table space should not override possible RSDP fix segment
*
@@ -604,8 +604,8 @@ uint64_t create_guest_initial_paging(struct vm *vm)
RSDP_F_ADDR, "RSDP fix segment could be override");
if (GUEST_INIT_PAGE_TABLE_SKIP_SIZE <
(unsigned long)&_ld_cpu_secondary_reset_size) {
panic("guest init PTs override cpu_secondary_reset code");
(unsigned long)&_ld_trampline_size) {
panic("guest init PTs override trampline code");
}
/* Using continuous memory for guest page tables, the total 4K page