OvmfPkg/PlatformPei: Add XenPublishRamRegions

This will be called from a unified MemDetect 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@15203 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 6166226481a4130192be52710c6a829a1b00d3f2..743044d29eb4ca5a260b46c5c34228338b394558 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -34,10 +34,6 @@
 #include <Guid/MemoryTypeInformation.h>\r
 #include <Ppi/MasterBootMode.h>\r
 #include <IndustryStandard/Pci22.h>\r
-#include <Guid/XenInfo.h>\r
-#include <IndustryStandard/E820.h>\r
-#include <Library/ResourcePublicationLib.h>\r
-#include <Library/MtrrLib.h>\r
 \r
 #include "Platform.h"\r
 #include "Cmos.h"\r
@@ -172,12 +168,6 @@ XenMemMapInitialization (
   VOID\r
   )\r
 {\r
-  EFI_E820_ENTRY64 *E820Map;\r
-  UINT32 E820EntriesCount;\r
-  EFI_STATUS Status;\r
-\r
-  DEBUG ((EFI_D_INFO, "Using memory map provided by Xen\n"));\r
-\r
   //\r
   // Create Memory Type Information HOB\r
   //\r
@@ -203,36 +193,7 @@ XenMemMapInitialization (
   //\r
   AddIoMemoryRangeHob (0x0A0000, BASE_1MB);\r
 \r
-  //\r
-  // Parse RAM in E820 map\r
-  //\r
-  Status = XenGetE820Map(&E820Map, &E820EntriesCount);\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  if (E820EntriesCount > 0) {\r
-    EFI_E820_ENTRY64 *Entry;\r
-    UINT32 Loop;\r
-\r
-    for (Loop = 0; Loop < E820EntriesCount; Loop++) {\r
-      Entry = E820Map + Loop;\r
-\r
-      //\r
-      // Only care about RAM\r
-      //\r
-      if (Entry->Type != EfiAcpiAddressRangeMemory) {\r
-        continue;\r
-      }\r
-\r
-      if (Entry->BaseAddr >= BASE_4GB) {\r
-        AddUntestedMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);\r
-      } else {\r
-        AddMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);\r
-      }\r
-\r
-      MtrrSetMemoryAttribute (Entry->BaseAddr, Entry->Length, CacheWriteBack);\r
-    }\r
-  }\r
+  XenPublishRamRegions ();\r
 }\r
 \r
 \r

diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h
index 4b72ee6b72df9018ce4ee27582d84e8e57505fc2..fa1a4bfe363984bbbee88db9ccec74a680e7b24d 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.h
+++ b/OvmfPkg/PlatformPei/Platform.h
@@ -86,10 +86,9 @@ XenDetect (
 \r
 extern BOOLEAN mXen;\r
 \r
-EFI_STATUS\r
-XenGetE820Map (\r
-  EFI_E820_ENTRY64 **Entries,\r
-  UINT32 *Count\r
+VOID\r
+XenPublishRamRegions (\r
+  VOID\r
   );\r
 \r
 #endif // _PLATFORM_PEI_H_INCLUDED_\r

diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c
index da3133bb9b7aa16625e2694e14bcc81ab0d9da34..3a2e358661826094fdbe000eed3bfcc52b67959c 100644 (file)
--- a/OvmfPkg/PlatformPei/Xen.c
+++ b/OvmfPkg/PlatformPei/Xen.c
@@ -27,6 +27,9 @@
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Guid/XenInfo.h>\r
+#include <IndustryStandard/E820.h>\r
+#include <Library/ResourcePublicationLib.h>\r
+#include <Library/MtrrLib.h>\r
 \r
 #include "Platform.h"\r
 #include "Xen.h"\r
@@ -149,6 +152,55 @@ XenDetect (
   return FALSE;\r
 }\r
 \r
+\r
+VOID\r
+XenPublishRamRegions (\r
+  VOID\r
+  )\r
+{\r
+  EFI_E820_ENTRY64  *E820Map;\r
+  UINT32            E820EntriesCount;\r
+  EFI_STATUS        Status;\r
+\r
+  if (!mXen) {\r
+    return;\r
+  }\r
+\r
+  DEBUG ((EFI_D_INFO, "Using memory map provided by Xen\n"));\r
+\r
+  //\r
+  // Parse RAM in E820 map\r
+  //\r
+  Status = XenGetE820Map (&E820Map, &E820EntriesCount);\r
+\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
+  if (E820EntriesCount > 0) {\r
+    EFI_E820_ENTRY64 *Entry;\r
+    UINT32 Loop;\r
+\r
+    for (Loop = 0; Loop < E820EntriesCount; Loop++) {\r
+      Entry = E820Map + Loop;\r
+\r
+      //\r
+      // Only care about RAM\r
+      //\r
+      if (Entry->Type != EfiAcpiAddressRangeMemory) {\r
+        continue;\r
+      }\r
+\r
+      if (Entry->BaseAddr >= BASE_4GB) {\r
+        AddUntestedMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);\r
+      } else {\r
+        AddMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);\r
+      }\r
+\r
+      MtrrSetMemoryAttribute (Entry->BaseAddr, Entry->Length, CacheWriteBack);\r
+    }\r
+  }\r
+}\r
+\r
+\r
 /**\r
   Perform Xen PEI initialization.\r
 \r