OvmfPkg/PlatformPei: Remove duplicate Xen memory map debug message

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

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 78b43d22b75f5bb2c641f6ad86eaf2a4f25802b1..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 - 2009, 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
@@ -30,13 +30,14 @@ Module Name:
 #include <Library/PcdLib.h>\r
 #include <Library/PeimEntryPoint.h>\r
 #include <Library/ResourcePublicationLib.h>\r
+#include <Library/MtrrLib.h>\r
 \r
 #include "Platform.h"\r
 #include "Cmos.h"\r
 \r
-STATIC\r
-UINTN\r
+UINT32\r
 GetSystemMemorySizeBelow4gb (\r
+  VOID\r
   )\r
 {\r
   UINT8 Cmos0x34;\r
@@ -82,35 +83,28 @@ GetSystemMemorySizeAbove4gb (
   return LShiftU64 (Size, 16);\r
 }\r
 \r
-\r
 /**\r
-  Peform Memory Detection\r
+  Publish PEI core memory\r
 \r
   @return EFI_SUCCESS     The PEIM initialized successfully.\r
 \r
 **/\r
-EFI_PHYSICAL_ADDRESS\r
-MemDetect (\r
+EFI_STATUS\r
+PublishPeiMemory (\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
-\r
-  //\r
-  // Determine total memory size available\r
-  //\r
   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
+  MemoryBase = PcdGet32 (PcdOvmfDxeMemFvBase) + PcdGet32 (PcdOvmfDxeMemFvSize);\r
   MemorySize = LowerMemorySize - MemoryBase;\r
   if (MemorySize > SIZE_64MB) {\r
     MemoryBase = LowerMemorySize - SIZE_64MB;\r
@@ -123,17 +117,60 @@ MemDetect (
   Status = PublishSystemMemory(MemoryBase, MemorySize);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  return Status;\r
+}\r
+\r
+\r
+/**\r
+  Peform Memory Detection for QEMU / KVM\r
+\r
+**/\r
+STATIC\r
+VOID\r
+QemuInitializeRam (\r
+  VOID\r
+  )\r
+{\r
+  UINT64                      LowerMemorySize;\r
+  UINT64                      UpperMemorySize;\r
+\r
+  DEBUG ((EFI_D_INFO, "%a called\n", __FUNCTION__));\r
+\r
+  //\r
+  // Determine total memory size available\r
+  //\r
+  LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
+  UpperMemorySize = GetSystemMemorySizeAbove4gb ();\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, LowerMemorySize - BASE_1MB, CacheWriteBack);\r
+\r
+  MtrrSetMemoryAttribute (0, BASE_512KB + BASE_128KB, CacheWriteBack);\r
+\r
   if (UpperMemorySize != 0) {\r
     AddUntestedMemoryBaseSizeHob (BASE_4GB, UpperMemorySize);\r
-  }\r
 \r
-  return MemoryBase + MemorySize;\r
+    MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);\r
+  }\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