OvmfPkg/PlatformPei: Call PublishPeiMemory in one place

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

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 9a82cc79d04e241fb420b03d6f4c9475fcfa3ae1..dcfe952219f8041b35caaceef2e1f845ee71f14d 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 - 2013, 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
-GetSystemMemorySize (\r
+GetSystemMemorySizeBelow4gb (\r
   )\r
 {\r
   UINT8 Cmos0x34;\r
@@ -58,36 +59,56 @@ GetSystemMemorySize (
 }\r
 \r
 \r
+STATIC\r
+UINT64\r
+GetSystemMemorySizeAbove4gb (\r
+  )\r
+{\r
+  UINT32 Size;\r
+  UINTN  CmosIndex;\r
+\r
+  //\r
+  // CMOS 0x5b-0x5d specifies the system memory above 4GB MB.\r
+  // * CMOS(0x5d) is the most significant size byte\r
+  // * CMOS(0x5c) is the middle size byte\r
+  // * CMOS(0x5b) is the least significant size byte\r
+  // * The size is specified in 64kb chunks\r
+  //\r
+\r
+  Size = 0;\r
+  for (CmosIndex = 0x5d; CmosIndex >= 0x5b; CmosIndex--) {\r
+    Size = (UINT32) (Size << 8) + (UINT32) CmosRead8 (CmosIndex);\r
+  }\r
+\r
+  return LShiftU64 (Size, 16);\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                      TotalMemorySize;\r
+  UINT64                      LowerMemorySize;\r
 \r
-  DEBUG ((EFI_D_ERROR, "MemDetect called\n"));\r
-\r
-  //\r
-  // Determine total memory size available\r
-  //\r
-  TotalMemorySize = (UINT64)GetSystemMemorySize ();\r
+  LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
 \r
   //\r
   // Determine the range of memory to use during PEI\r
   //\r
-  MemoryBase = PcdGet32 (PcdOvmfMemFvBase) + PcdGet32 (PcdOvmfMemFvSize);\r
-  MemorySize = TotalMemorySize - MemoryBase;\r
-  if (MemorySize > SIZE_16MB) {\r
-    MemoryBase = TotalMemorySize - SIZE_16MB;\r
-    MemorySize = SIZE_16MB;\r
+  MemoryBase = PcdGet32 (PcdOvmfDxeMemFvBase) + PcdGet32 (PcdOvmfDxeMemFvSize);\r
+  MemorySize = LowerMemorySize - MemoryBase;\r
+  if (MemorySize > SIZE_64MB) {\r
+    MemoryBase = LowerMemorySize - SIZE_64MB;\r
+    MemorySize = SIZE_64MB;\r
   }\r
 \r
   //\r
@@ -96,13 +117,47 @@ MemDetect (
   Status = PublishSystemMemory(MemoryBase, MemorySize);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  return Status;\r
+}\r
+\r
+\r
+/**\r
+  Peform Memory Detection\r
+\r
+  @return Top of memory\r
+\r
+**/\r
+EFI_PHYSICAL_ADDRESS\r
+MemDetect (\r
+  )\r
+{\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
   // 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
-  return MemoryBase + MemorySize;\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
+    MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);\r
+  }\r
+\r
+  return LowerMemorySize;\r
 }\r
 \r