OvmfPkg: Update DxeAcpiTimerLib to read HostBridgeDevId in PlatformInfoHob

RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3429

The entrypoint of DxeAcpiTimerLib checks HostBridgeDevId by reading
PcdOvmfHostBridgePciDevId. If the DevId is not set, ASSERT is
triggered. Normally this DevId is set in PlatformPei which is executed
in PEI phase.

This patch-set is introducing PEI-less boot which means PEI phase is
skipped. So there is no chance to set this DevId. Instead HostBridgeDevId
is set in PlatformInfoHob. So we can check if PlatformInfoHob exists and
if HostBridgeDevId is set in this Hob.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>

diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
index 1158461874550db1b8c40a5a1560e09ceff78cbc..01a41a6a451504dfbce6f94a800554552f4aa8eb 100644 (file)
--- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
@@ -6,10 +6,16 @@
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 **/\r
 \r
+#include <Uefi/UefiBaseType.h>\r
+#include <Uefi/UefiMultiPhase.h>\r
+#include <Pi/PiBootMode.h>\r
+#include <Pi/PiHob.h>\r
+#include <Library/HobLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/IoLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/PciLib.h>\r
+#include <Library/PlatformInitLib.h>\r
 #include <OvmfPlatforms.h>\r
 \r
 //\r
@@ -36,13 +42,26 @@ AcpiTimerLibConstructor (
   VOID\r
   )\r
 {\r
-  UINT16  HostBridgeDevId;\r
-  UINTN   Pmba;\r
+  UINT16                 HostBridgeDevId;\r
+  UINTN                  Pmba;\r
+  EFI_HOB_GUID_TYPE      *GuidHob;\r
+  EFI_HOB_PLATFORM_INFO  *PlatformInfoHob = NULL;\r
 \r
   //\r
   // Query Host Bridge DID to determine platform type\r
+  // Tdx guest stores the HostBridgePciDevId in a GuidHob.\r
+  // So we first check if this HOB exists\r
   //\r
-  HostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId);\r
+  GuidHob = GetFirstGuidHob (&gUefiOvmfPkgPlatformInfoGuid);\r
+  if (GuidHob != NULL) {\r
+    PlatformInfoHob = (EFI_HOB_PLATFORM_INFO *)GET_GUID_HOB_DATA (GuidHob);\r
+    HostBridgeDevId = PlatformInfoHob->HostBridgeDevId;\r
+  } else {\r
+    DEBUG ((DEBUG_ERROR, "PlatformInfoHob is not found.\n"));\r
+    ASSERT (FALSE);\r
+    return RETURN_UNSUPPORTED;\r
+  }\r
+\r
   switch (HostBridgeDevId) {\r
     case INTEL_82441_DEVICE_ID:\r
       Pmba = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA);\r

diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
index e29872add3c7490179dae1d1205e109102a7eee9..9c364be886bdbac6f26e115b5f2812ec89948ece 100644 (file)
--- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
+++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
@@ -26,10 +26,11 @@
   MdePkg/MdePkg.dec\r
   OvmfPkg/OvmfPkg.dec\r
 \r
-[Pcd]\r
-  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId\r
-\r
 [LibraryClasses]\r
   BaseLib\r
   PciLib\r
   IoLib\r
+  HobLib\r
+\r
+[Guids]\r
+  gUefiOvmfPkgPlatformInfoGuid                      ## CONSUMES\r