ArmPlatformPkg/BdsLib: Let the user press enter when inputting booleans

[mirror_edk2.git] / OvmfPkg / PlatformPei / MemDetect.c

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 9145ebb89daa1448c6ad91842cbe11f6ace0697c..29df5370b05e68ca00c0ebd98239c22778991876 100644 (file)
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -1,7 +1,7 @@
 /**@file\r
   Memory Detection for Virtual Machines.\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -35,9 +35,9 @@ Module Name:
 #include "Platform.h"\r
 #include "Cmos.h"\r
 \r
-STATIC\r
-UINTN\r
+UINT32\r
 GetSystemMemorySizeBelow4gb (\r
+  VOID\r
   )\r
 {\r
   UINT8 Cmos0x34;\r
@@ -101,7 +101,10 @@ PublishPeiMemory (
 \r
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
 \r
-  MemoryBase = PcdGet32 (PcdOvmfMemFvBase) + PcdGet32 (PcdOvmfMemFvSize);\r
+  //\r
+  // Determine the range of memory to use during PEI\r
+  //\r
+  MemoryBase = PcdGet32 (PcdOvmfDxeMemFvBase) + PcdGet32 (PcdOvmfDxeMemFvSize);\r
   MemorySize = LowerMemorySize - MemoryBase;\r
   if (MemorySize > SIZE_64MB) {\r
     MemoryBase = LowerMemorySize - SIZE_64MB;\r
@@ -119,22 +122,19 @@ PublishPeiMemory (
 \r
 \r
 /**\r
-  Peform Memory Detection\r
-\r
-  @return Top of memory\r
+  Peform Memory Detection for QEMU / KVM\r
 \r
 **/\r
-EFI_PHYSICAL_ADDRESS\r
-MemDetect (\r
+STATIC\r
+VOID\r
+QemuInitializeRam (\r
+  VOID\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase;\r
-  UINT64                      MemorySize;\r
   UINT64                      LowerMemorySize;\r
   UINT64                      UpperMemorySize;\r
 \r
-  DEBUG ((EFI_D_ERROR, "MemDetect called\n"));\r
+  DEBUG ((EFI_D_INFO, "%a called\n", __FUNCTION__));\r
 \r
   //\r
   // Determine total memory size available\r
@@ -142,30 +142,13 @@ MemDetect (
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
   UpperMemorySize = GetSystemMemorySizeAbove4gb ();\r
 \r
-  //\r
-  // Determine the range of memory to use during PEI\r
-  //\r
-  MemoryBase = PcdGet32 (PcdOvmfMemFvBase) + PcdGet32 (PcdOvmfMemFvSize);\r
-  MemorySize = LowerMemorySize - MemoryBase;\r
-  if (MemorySize > SIZE_64MB) {\r
-    MemoryBase = LowerMemorySize - SIZE_64MB;\r
-    MemorySize = SIZE_64MB;\r
-  }\r
-\r
-  //\r
-  // Publish this memory to the PEI Core\r
-  //\r
-  Status = PublishSystemMemory(MemoryBase, MemorySize);\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
   //\r
   // Create memory HOBs\r
   //\r
-  AddMemoryBaseSizeHob (MemoryBase, MemorySize);\r
-  AddMemoryRangeHob (BASE_1MB, MemoryBase);\r
+  AddMemoryRangeHob (BASE_1MB, LowerMemorySize);\r
   AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);\r
 \r
-  MtrrSetMemoryAttribute (BASE_1MB, MemoryBase + MemorySize - BASE_1MB, CacheWriteBack);\r
+  MtrrSetMemoryAttribute (BASE_1MB, LowerMemorySize - BASE_1MB, CacheWriteBack);\r
 \r
   MtrrSetMemoryAttribute (0, BASE_512KB + BASE_128KB, CacheWriteBack);\r
 \r
@@ -174,7 +157,20 @@ MemDetect (
 \r
     MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);\r
   }\r
-\r
-  return MemoryBase + MemorySize;\r
 }\r
 \r
+/**\r
+  Publish system RAM and reserve memory regions\r
+\r
+**/\r
+VOID\r
+InitializeRamRegions (\r
+  VOID\r
+  )\r
+{\r
+  if (!mXen) {\r
+    QemuInitializeRam ();\r
+  } else {\r
+    XenPublishRamRegions ();\r
+  }\r
+}\r