OvmfPkg/PlatformPei: Add InitializeRamRegions function

In the next commit we will update the Xen boot path
to also use this function.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15206 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 851850b50dd47d46835b31c78975be0eb876b646..26e4feafe8e399366c12e6b023497a4d6f957f29 100644 (file)
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -122,19 +122,19 @@ PublishPeiMemory (
 \r
 \r
 /**\r
 \r
 \r
 /**\r

-  Peform Memory Detection\r
-\r
-  @return Top of memory\r
+  Peform Memory Detection for QEMU / KVM\r

 \r
 **/\r
 \r
 **/\r

-EFI_PHYSICAL_ADDRESS\r
-MemDetect (\r
+STATIC\r
+VOID\r
+QemuInitializeRam (\r
+  VOID\r

   )\r
 {\r
   UINT64                      LowerMemorySize;\r
   UINT64                      UpperMemorySize;\r
 \r
   )\r
 {\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
 \r
   //\r
   // Determine total memory size available\r


@@ -157,7 +157,16 @@ MemDetect (
 \r
     MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);\r
   }\r
 \r
     MtrrSetMemoryAttribute (BASE_4GB, UpperMemorySize, CacheWriteBack);\r
   }\r

-\r
-  return LowerMemorySize;\r

 }\r
 \r
 }\r
 \r

+/**\r
+  Publish system RAM and reserve memory regions\r
+\r
+**/\r
+VOID\r
+InitializeRamRegions (\r
+  VOID\r
+  )\r
+{\r
+  QemuInitializeRam ();\r
+}\r

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index c48fe974be71bf059f251466109cfe3ea6c0497b..90be3c33ad0dbce1283bc5c22787a9812d65d720 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -355,7 +355,7 @@ InitializePlatform (
   PublishPeiMemory ();\r
 \r
   if (!mXen) {\r
   PublishPeiMemory ();\r
 \r
   if (!mXen) {\r

-    MemDetect ();\r
+    InitializeRamRegions ();\r

   }\r
 \r
   if (mXen) {\r
   }\r
 \r
   if (mXen) {\r

diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h
index 48996ab7ff540b555bee958e1b349cfc90a513c2..5cce7961bc6bc75dd826f4215f8999a368a234f8 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.h
+++ b/OvmfPkg/PlatformPei/Platform.h
@@ -69,8 +69,8 @@ GetSystemMemorySizeBelow4gb (
   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r

-EFI_PHYSICAL_ADDRESS\r
-MemDetect (\r
+VOID\r
+InitializeRamRegions (\r

   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r