github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 20:53:46 +00:00
Code Issues Projects Releases Wiki Activity

hv: mmu: add 16GB RAM support for uefi platform

Browse Source 
And fix a bug when the start address of the e820 not align to 2MB.

Tracked-On: #861
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2018-11-03 01:29:54 +08:00 committed by wenlingz
parent c36f4d2789
commit eefb06b303
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hypervisor/arch/x86/Kconfig
View File

@ -75,7 +75,8 @@ config MAX_VM_NUM
config MAX_VCPUS_PER_VM config MAX_VCPUS_PER_VM
int "Maximum number of VCPUS per VM" int "Maximum number of VCPUS per VM"
range 1 8 range 1 8
default 4 default 4 if PLATFORM_SBL
default 8 if PLATFORM_UEFI
help help
The maximum number of virtual CPUs the hypervisor can support in a The maximum number of virtual CPUs the hypervisor can support in a
single VM. single VM.
@ -218,7 +219,8 @@ config HV_RAM_START
config HV_RAM_SIZE config HV_RAM_SIZE
hex "Size of the RAM region used by the hypervisor" hex "Size of the RAM region used by the hypervisor"
default 0x04800000 default 0x04800000 if PLATFORM_SBL
default 0x08000000 if PLATFORM_UEFI
help help
A 64-bit integer indicating the size of RAM used by the hypervisor. A 64-bit integer indicating the size of RAM used by the hypervisor.
It is ensured at link time that the footprint of the hypervisor It is ensured at link time that the footprint of the hypervisor
@ -226,22 +228,23 @@ config HV_RAM_SIZE
config PLATFORM_RAM_SIZE config PLATFORM_RAM_SIZE
hex "Size of the physical platform RAM" hex "Size of the physical platform RAM"
default 0x200000000 default 0x200000000 if PLATFORM_SBL
default 0x400000000 if PLATFORM_UEFI
help help
A 64-bit integer indicating the size of the physical platform RAM A 64-bit integer indicating the size of the physical platform RAM
(not included the MMIO). (not included the MMIO).
config SOS_RAM_SIZE config SOS_RAM_SIZE
hex "Size of the vm0 RAM" hex "Size of the vm0 RAM"
default 0x200000000 if SHARING_MODE default 0x200000000 if PLATFORM_SBL
default 0x000000000 if PARTITION_MODE default 0x400000000 if PLATFORM_UEFI
help help
A 64-bit integer indicating the size of the vm0 RAM (not included the MMIO). A 64-bit integer indicating the size of the vm0 RAM (not included the MMIO).
config UOS_RAM_SIZE config UOS_RAM_SIZE
hex "Size of the UOS RAM" hex "Size of the UOS RAM"
default 0x100000000 if SHARING_MODE default 0x100000000 if PLATFORM_SBL
default 0x100000000 if PARTITION_MODE default 0x200000000 if PLATFORM_UEFI
help help
A 64-bit integer indicating the size of the user OS RAM (not included the MMIO). A 64-bit integer indicating the size of the user OS RAM (not included the MMIO).
Now we assume each UOS uses same amount of RAM size. Now we assume each UOS uses same amount of RAM size.

4
hypervisor/arch/x86/mmu.c
View File

@ -253,8 +253,8 @@ void init_paging(void)
} }
/* Map all memory regions to UC attribute */ /* Map all memory regions to UC attribute */
mmu_add((uint64_t *)ppt_mmu_pml4_addr, e820_mem.mem_bottom, e820_mem.mem_bottom, mmu_add((uint64_t *)ppt_mmu_pml4_addr, 0UL, 0UL,
high64_max_ram - e820_mem.mem_bottom, attr_uc, &ppt_mem_ops); high64_max_ram - 0UL, attr_uc, &ppt_mem_ops);
/* Modify WB attribute for E820_TYPE_RAM */ /* Modify WB attribute for E820_TYPE_RAM */
for (i = 0U; i < e820_entries; i++) { for (i = 0U; i < e820_entries; i++) {