From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web09.17717.1645324415382497262 for ; Sat, 19 Feb 2022 18:33:53 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=k7ZsKBcS; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: min.m.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1645324433; x=1676860433; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pJF6070gYhdC+5oBDHAh8sqhLE1iTRy9iHxqnHVGNCE=; b=k7ZsKBcS/WmuqVOcedfZQr0WVpVBPa0yMe+Eeey9jk3GTBbCgIxTAN7i VcDhzwmMVizVl7clCekUM+b8OZBfHSelcXvA5UAm4iZ5MTaNfWlWOpCQv 4/f8aKklrSgX31DCWT/p4s9AEWoltvi9To9M9zqsamnuZw5YCmI57p3LM aIh2aGAY1QLVB0pM8BhZ8GH8SEFNUSNFGuZkjbzYbHq3a2ZDYj61tkt49 4fOZIS28MU5JneSoDK/iz/oAYo6mpR/3llhFOrh0jEnsNhyBvwkQGFOV/ E3Qr0dGyUPdPUwFsYvboeDQl9cRGrZdVRYbiOEelTguk3o69JJFUw7KK+ w==; X-IronPort-AV: E=McAfee;i="6200,9189,10263"; a="231961758" X-IronPort-AV: E=Sophos;i="5.88,382,1635231600"; d="scan'208";a="231961758" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2022 18:33:52 -0800 X-IronPort-AV: E=Sophos;i="5.88,382,1635231600"; d="scan'208";a="705818770" Received: from wangz1-mobl.ccr.corp.intel.com (HELO mxu9-mobl1.ccr.corp.intel.com) ([10.255.31.171]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2022 18:33:50 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min Xu , Michael D Kinney , Brijesh Singh , Erdem Aktas , James Bottomley , Jiewen Yao , Tom Lendacky , Gerd Hoffmann Subject: [PATCH V3 7/8] OvmfPkg: Update DxeAcpiTimerLib to read HostBridgeDevId in PlatformInfoHob Date: Sun, 20 Feb 2022 10:33:18 +0800 Message-Id: <20220220023319.1495-8-min.m.xu@intel.com> X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: <20220220023319.1495-1-min.m.xu@intel.com> References: <20220220023319.1495-1-min.m.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Here is the summary: - For boot without Pei phase, HostBridgeDevId is set in PlatformInfoHob. - For boot with Pei phase, HostBridgeDevId is set in PcdOvmfHostBridgePciDevId. As the first stage DxeAcpiTimerLib first checks PlatformInfoHob then the PcdOvmfHostBridgePciDevId. We will revisit here after HostBridgeDevId is uniformly set in PlatformInfoHob. Cc: Michael D Kinney Cc: Brijesh Singh Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Tom Lendacky Cc: Gerd Hoffmann Signed-off-by: Min Xu --- .../Library/AcpiTimerLib/DxeAcpiTimerLib.c | 23 ++++++++++++++++--- .../Library/AcpiTimerLib/DxeAcpiTimerLib.inf | 4 ++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c index 115846187455..71c8d75200bb 100644 --- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c @@ -6,10 +6,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ +#include +#include +#include +#include +#include #include #include #include #include +#include #include // @@ -36,13 +42,24 @@ AcpiTimerLibConstructor ( VOID ) { - UINT16 HostBridgeDevId; - UINTN Pmba; + UINT16 HostBridgeDevId; + UINTN Pmba; + EFI_HOB_GUID_TYPE *GuidHob; + EFI_HOB_PLATFORM_INFO *PlatformInfo = NULL; // // Query Host Bridge DID to determine platform type + // Tdx guest stores the HostBridgePciDevId in a GuidHob. + // So we first check if this HOB exists // - HostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId); + GuidHob = GetFirstGuidHob (&gUefiOvmfPkgTdxPlatformGuid); + if (GuidHob != NULL) { + PlatformInfo = (EFI_HOB_PLATFORM_INFO *)GET_GUID_HOB_DATA (GuidHob); + HostBridgeDevId = PlatformInfo->HostBridgePciDevId; + } else { + HostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId); + } + switch (HostBridgeDevId) { case INTEL_82441_DEVICE_ID: Pmba = POWER_MGMT_REGISTER_PIIX4 (PIIX4_PMBA); diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf index e29872add3c7..44a4423a9ddd 100644 --- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf +++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf @@ -33,3 +33,7 @@ BaseLib PciLib IoLib + HobLib + +[Guids] + gUefiOvmfPkgTdxPlatformGuid ## CONSUMES -- 2.29.2.windows.2