OvmfPkg/Csm/LegacyBiosDxe: Fix Legacy16GetTableAddress call for E820 data

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

diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c
index 1bb6b50a4d9b8562fd1ba3c0c3d6c99c191dda89..89dc4143b23b6fa060ca216ca8211b2b73d65a2c 100644 (file)
--- a/OvmfPkg/PlatformPei/Xen.c
+++ b/OvmfPkg/PlatformPei/Xen.c
@@ -1,16 +1,10 @@
 /**@file\r
   Xen Platform PEI support\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2011, Andrei Warkentin <andreiw@motorola.com>\r
 \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
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -27,11 +21,46 @@
 #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
+\r
+BOOLEAN mXen = FALSE;\r
+\r
+STATIC UINT32 mXenLeaf = 0;\r
 \r
 EFI_XEN_INFO mXenInfo;\r
 \r
+/**\r
+  Returns E820 map provided by Xen\r
+\r
+  @param Entries      Pointer to E820 map\r
+  @param Count        Number of entries\r
+\r
+  @return EFI_STATUS\r
+**/\r
+EFI_STATUS\r
+XenGetE820Map (\r
+  EFI_E820_ENTRY64 **Entries,\r
+  UINT32 *Count\r
+  )\r
+{\r
+  EFI_XEN_OVMF_INFO *Info =\r
+    (EFI_XEN_OVMF_INFO *)(UINTN) OVMF_INFO_PHYSICAL_ADDRESS;\r
+\r
+  if (AsciiStrCmp ((CHAR8 *) Info->Signature, "XenHVMOVMF")) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  ASSERT (Info->E820 < MAX_ADDRESS);\r
+  *Entries = (EFI_E820_ENTRY64 *)(UINTN) Info->E820;\r
+  *Count = Info->E820EntriesCount;\r
+\r
+  return EFI_SUCCESS;\r
+}\r
 \r
 /**\r
   Connects to the Hypervisor.\r
@@ -66,8 +95,8 @@ XenConnect (
   AsmCpuid (XenLeaf + 1, &XenVersion, NULL, NULL, NULL);\r
   DEBUG ((EFI_D_ERROR, "Detected Xen version %d.%d\n",\r
           XenVersion >> 16, XenVersion & 0xFFFF));\r
-  mXenInfo.VersionMajor = XenVersion >> 16;\r
-  mXenInfo.VersionMinor = XenVersion & 0xFFFF;\r
+  mXenInfo.VersionMajor = (UINT16)(XenVersion >> 16);\r
+  mXenInfo.VersionMinor = (UINT16)(XenVersion & 0xFFFF);\r
 \r
   /* TBD: Locate hvm_info and reserve it away. */\r
   mXenInfo.HvmInfo = NULL;\r
@@ -84,32 +113,85 @@ XenConnect (
 /**\r
   Figures out if we are running inside Xen HVM.\r
 \r
-  @return UINT32     CPUID index used to connect to HV.\r
+  @retval TRUE   Xen was detected\r
+  @retval FALSE  Xen was not detected\r
 \r
 **/\r
-UINT32\r
+BOOLEAN\r
 XenDetect (\r
   VOID\r
   )\r
 {\r
-\r
-  UINT32 XenLeaf;\r
   UINT8 Signature[13];\r
 \r
-  for (XenLeaf = 0x40000000; XenLeaf < 0x40010000; XenLeaf += 0x100) {\r
-    AsmCpuid (XenLeaf, NULL, (UINT32 *) &Signature[0],\r
+  if (mXenLeaf != 0) {\r
+    return TRUE;\r
+  }\r
+\r
+  Signature[12] = '\0';\r
+  for (mXenLeaf = 0x40000000; mXenLeaf < 0x40010000; mXenLeaf += 0x100) {\r
+    AsmCpuid (mXenLeaf,\r
+              NULL,\r
+              (UINT32 *) &Signature[0],\r
               (UINT32 *) &Signature[4],\r
               (UINT32 *) &Signature[8]);\r
-    Signature[12] = '\0';\r
 \r
     if (!AsciiStrCmp ((CHAR8 *) Signature, "XenVMMXenVMM")) {\r
-      return XenLeaf;\r
+      mXen = TRUE;\r
+      return TRUE;\r
     }\r
   }\r
 \r
-  return 0;\r
+  mXenLeaf = 0;\r
+  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
+  E820EntriesCount = 0;\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
+      AddMemoryBaseSizeHob (Entry->BaseAddr, Entry->Length);\r
+\r
+      MtrrSetMemoryAttribute (Entry->BaseAddr, Entry->Length, CacheWriteBack);\r
+    }\r
+  }\r
+}\r
+\r
+\r
 /**\r
   Perform Xen PEI initialization.\r
 \r
@@ -122,23 +204,22 @@ InitializeXen (
   VOID\r
   )\r
 {\r
-  UINT32 XenLeaf;\r
-\r
-  XenLeaf = XenDetect ();\r
+  RETURN_STATUS PcdStatus;\r
 \r
-  if (XenLeaf == 0) {\r
+  if (mXenLeaf == 0) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Xen was detected\n"));\r
-\r
-  XenConnect (XenLeaf);\r
+  XenConnect (mXenLeaf);\r
 \r
   //\r
   // Reserve away HVMLOADER reserved memory [0xFC000000,0xFD000000).\r
   // This needs to match HVMLOADER RESERVED_MEMBASE/RESERVED_MEMSIZE.\r
   //\r
-  AddReservedMemoryBaseSizeHob (0xFC000000, 0x1000000);\r
+  AddReservedMemoryBaseSizeHob (0xFC000000, 0x1000000, FALSE);\r
+\r
+  PcdStatus = PcdSetBoolS (PcdPciDisableBusEnumeration, TRUE);\r
+  ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   return EFI_SUCCESS;\r
 }\r