OvmfPkg/PlatformPei: Add XenPublishRamRegions

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

diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 10ae623dddbc4b9c09440a740c31d010bc9463dd..743044d29eb4ca5a260b46c5c34228338b394558 100644 (file)
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -1,7 +1,7 @@
 /**@file\r
   Platform PEI driver\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2011, Andrei Warkentin <andreiw@motorola.com>\r
 \r
   This program and the accompanying materials\r
@@ -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
@@ -410,7 +371,6 @@ InitializePlatform (
   )\r
 {\r
   EFI_PHYSICAL_ADDRESS  TopOfMemory;\r
-  UINT32 XenLeaf;\r
 \r
   TopOfMemory = 0;\r
 \r
@@ -418,26 +378,28 @@ InitializePlatform (
 \r
   DebugDumpCmos ();\r
 \r
-  XenLeaf = XenDetect ();\r
+  XenDetect ();\r
+\r
+  BootModeInitialization ();\r
 \r
   PublishPeiMemory ();\r
 \r
-  if (XenLeaf != 0) {\r
+  if (mXen) {\r
     PcdSetBool (PcdPciDisableBusEnumeration, TRUE);\r
   } else {\r
     TopOfMemory = MemDetect ();\r
   }\r
 \r
-  if (XenLeaf != 0) {\r
+  if (mXen) {\r
     DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r
-    InitializeXen (XenLeaf);\r
+    InitializeXen ();\r
   }\r
 \r
   ReserveEmuVariableNvStore ();\r
 \r
   PeiFvInitialization ();\r
 \r
-  if (XenLeaf != 0) {\r
+  if (mXen) {\r
     XenMemMapInitialization ();\r
   } else {\r
     MemMapInitialization (TopOfMemory);\r
@@ -445,7 +407,5 @@ InitializePlatform (
 \r
   MiscInitialization ();\r
 \r
-  BootModeInitialization ();\r
-\r
   return EFI_SUCCESS;\r
 }\r