OvmfPkg/XenPlatformPei: Detect OVMF_INFO from hvmloader

EFI_XEN_OVMF_INFO is only useful to retrieve the E820 table. The
mXenHvmloaderInfo isn't used yet, but will be use in a further patch to
retrieve the E820 table.

Also remove the unused pointer from the XenInfo HOB as that information
is only useful in the XenPlatformPei.

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1689
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20190813113119.14804-11-anthony.perard@citrix.com>

diff --git a/OvmfPkg/Include/Guid/XenInfo.h b/OvmfPkg/Include/Guid/XenInfo.h
index 25d76a7828239f7a4bebb16a15f83be13d6232d7..b052d618fd43014454515d2d85d279a2b31fa046 100644 (file)
--- a/OvmfPkg/Include/Guid/XenInfo.h
+++ b/OvmfPkg/Include/Guid/XenInfo.h
@@ -18,10 +18,6 @@ typedef struct {
   ///\r
   VOID *HyperPages;\r
   ///\r
-  /// Location of the hvm_info page.\r
-  ///\r
-  VOID *HvmInfo;\r
-  ///\r
   /// Hypervisor major version.\r
   ///\r
   UINT16 VersionMajor;\r

diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c
index 89dc4143b23b6fa060ca216ca8211b2b73d65a2c..3e15b32a73bf0f14d43806909e5572f38479c5d2 100644 (file)
--- a/OvmfPkg/PlatformPei/Xen.c
+++ b/OvmfPkg/PlatformPei/Xen.c
@@ -98,9 +98,6 @@ XenConnect (
   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
-\r
   BuildGuidDataHob (\r
     &gEfiXenInfoGuid,\r
     &mXenInfo,\r

diff --git a/OvmfPkg/XenPlatformPei/Xen.c b/OvmfPkg/XenPlatformPei/Xen.c
index f4d0d1c73b19738d67e9b68c9534dc75c8f9c803..9962fe9fc796ba819e980b6b2c03fa6760f9b42f 100644 (file)
--- a/OvmfPkg/XenPlatformPei/Xen.c
+++ b/OvmfPkg/XenPlatformPei/Xen.c
@@ -33,6 +33,12 @@ STATIC UINT32 mXenLeaf = 0;
 \r
 EFI_XEN_INFO mXenInfo;\r
 \r
+//\r
+// Location of the firmware info struct setup by hvmloader.\r
+// Only the E820 table is used by OVMF.\r
+//\r
+EFI_XEN_OVMF_INFO *mXenHvmloaderInfo;\r
+\r
 /**\r
   Returns E820 map provided by Xen\r
 \r
@@ -78,6 +84,8 @@ XenConnect (
   UINT32 TransferReg;\r
   UINT32 TransferPages;\r
   UINT32 XenVersion;\r
+  EFI_XEN_OVMF_INFO *Info;\r
+  CHAR8 Sig[sizeof (Info->Signature) + 1];\r
 \r
   AsmCpuid (XenLeaf + 2, &TransferPages, &TransferReg, NULL, NULL);\r
   mXenInfo.HyperPages = AllocatePages (TransferPages);\r
@@ -97,8 +105,21 @@ XenConnect (
   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
+  //\r
+  // Check if there are information left by hvmloader\r
+  //\r
+\r
+  Info = (EFI_XEN_OVMF_INFO *)(UINTN) OVMF_INFO_PHYSICAL_ADDRESS;\r
+  //\r
+  // Copy the signature, and make it null-terminated.\r
+  //\r
+  AsciiStrnCpyS (Sig, sizeof (Sig), (CHAR8 *) &Info->Signature,\r
+    sizeof (Info->Signature));\r
+  if (AsciiStrCmp (Sig, "XenHVMOVMF") == 0) {\r
+    mXenHvmloaderInfo = Info;\r
+  } else {\r
+    mXenHvmloaderInfo = NULL;\r
+  }\r
 \r
   BuildGuidDataHob (\r
     &gEfiXenInfoGuid,\r