github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 05:57:33 +00:00
Code Issues Projects Releases Wiki Activity

HV: init e820 before init paging

Browse Source 
In the commit of 4e1deab3d9, we changed the
init sequence that init paging first and then init e820 because we worried
about the efi memory map could be beyond 4GB space on some platform.

After we double checked multiboot2 spec, when system boot from multiboot2
protocol, the efi memory map info will be embedded in multiboot info so it
is guaranteed that the efi memory map must be under 4GB space. Consider that
the page table will be allocated in free memory space in future, we have
to change the init sequence back that init e820 first and then init paging.

If we need to support other boot protocol in future that the efi memory map
might be put beyond 4GB, we could have below options:
	1. Request bootloader put efi memory map below 4GB;
	2. Call EFI_BOOT_SERVICES.GetMemoryMap() before ExitBootServices();
	3. Enable a early 64bit page table to get the efi memory map only;

Tracked-On: #5626

Signed-off-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Victor Sun 2021-09-22 10:28:33 +08:00 committed by wenlingz
parent 8f2ede9cfd
commit 28824c1e74
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hypervisor/arch/x86/cpu.c
View File

@ -156,9 +156,10 @@ void init_pcpu_pre(bool is_bsp)
load_pcpu_state_data();
init_e820();
/* Initialize the hypervisor paging */
init_paging();
init_e820();
/*
* Need update uart_base_address here for vaddr2paddr mapping may changed

4
hypervisor/boot/boot.c
View File

@ -55,8 +55,8 @@ int32_t sanitize_acrn_boot_info(struct acrn_boot_info *abi)
}
printf("%s environment detected.\n", boot_from_uefi(abi) ? "UEFI" : "Non-UEFI");
if (boot_from_uefi(abi) && (abi->uefi_info.memmap == 0U) && (abi->uefi_info.memmap_hi == 0U)) {
pr_err("no efi memmap found!");
if (boot_from_uefi(abi) && ((abi->uefi_info.memmap == 0U) || (abi->uefi_info.memmap_hi != 0U))) {
pr_err("no efi memmap found below 4GB space!");
abi_status = -EINVAL;
}

1
hypervisor/boot/multiboot/multiboot2.c
View File

@ -66,6 +66,7 @@ static void mb2_efimmap_to_abi(struct acrn_boot_info *abi,
abi->uefi_info.memdesc_version = mb2_tag_efimmap->descr_vers;
abi->uefi_info.memmap = (uint32_t)(uint64_t)mb2_tag_efimmap->efi_mmap;
abi->uefi_info.memmap_size = mb2_tag_efimmap->size - 16U;
/* Per multiboot2 spec, multiboot info is below 4GB space hence memmap_hi must be 0U. */
abi->uefi_info.memmap_hi = (uint32_t)(((uint64_t)mb2_tag_efimmap->efi_mmap) >> 32U);
}