From eefb06b303b2544436d9b585603bd89c54c7d46c Mon Sep 17 00:00:00 2001
From: "Li, Fei1" <fei1.li@intel.com>
Date: Sat, 3 Nov 2018 01:29:54 +0800
Subject: [PATCH] hv: mmu: add 16GB RAM support for uefi platform

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>
---
 hypervisor/arch/x86/Kconfig | 17 ++++++++++-------
 hypervisor/arch/x86/mmu.c   |  4 ++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/hypervisor/arch/x86/Kconfig b/hypervisor/arch/x86/Kconfig
index e8428af65..fba0c07a9 100644
--- a/hypervisor/arch/x86/Kconfig
+++ b/hypervisor/arch/x86/Kconfig
@@ -75,7 +75,8 @@ config MAX_VM_NUM
 config MAX_VCPUS_PER_VM
 	int "Maximum number of VCPUS per VM"
 	range 1 8
-	default 4
+	default 4 if PLATFORM_SBL
+	default 8 if PLATFORM_UEFI
 	help
 	  The maximum number of virtual CPUs the hypervisor can support in a
 	  single VM.
@@ -218,7 +219,8 @@ config HV_RAM_START
 
 config HV_RAM_SIZE
 	hex "Size of the RAM region used by the hypervisor"
-	default 0x04800000
+	default 0x04800000 if PLATFORM_SBL
+	default 0x08000000 if PLATFORM_UEFI
 	help
 	  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
@@ -226,22 +228,23 @@ config HV_RAM_SIZE
 
 config PLATFORM_RAM_SIZE
 	hex "Size of the physical platform RAM"
-	default 0x200000000
+	default 0x200000000 if PLATFORM_SBL
+	default 0x400000000 if PLATFORM_UEFI
 	help
 	  A 64-bit integer indicating the size of the physical platform RAM
 	  (not included the MMIO).
 
 config SOS_RAM_SIZE
 	hex "Size of the vm0 RAM"
-	default 0x200000000 if SHARING_MODE
-	default 0x000000000 if PARTITION_MODE
+	default 0x200000000 if PLATFORM_SBL
+	default 0x400000000 if PLATFORM_UEFI
 	help
 	  A 64-bit integer indicating the size of the vm0 RAM (not included the MMIO).
 
  config UOS_RAM_SIZE
 	hex "Size of the UOS RAM"
-	default 0x100000000 if SHARING_MODE
-	default 0x100000000 if PARTITION_MODE
+	default 0x100000000 if PLATFORM_SBL
+	default 0x200000000 if PLATFORM_UEFI
 	help
 	  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.
diff --git a/hypervisor/arch/x86/mmu.c b/hypervisor/arch/x86/mmu.c
index 823ab80c2..6c86e2a39 100644
--- a/hypervisor/arch/x86/mmu.c
+++ b/hypervisor/arch/x86/mmu.c
@@ -253,8 +253,8 @@ void init_paging(void)
 	}
 
 	/* Map all memory regions to UC attribute */
-	mmu_add((uint64_t *)ppt_mmu_pml4_addr, e820_mem.mem_bottom, e820_mem.mem_bottom,
-		high64_max_ram - e820_mem.mem_bottom, attr_uc, &ppt_mem_ops);
+	mmu_add((uint64_t *)ppt_mmu_pml4_addr, 0UL, 0UL,
+		high64_max_ram - 0UL, attr_uc, &ppt_mem_ops);
 
 	/* Modify WB attribute for E820_TYPE_RAM */
 	for (i = 0U; i < e820_entries; i++) {