RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3429
These PCDs are set in PEI phase in Config-A. But in Config-B PEI phase is skipped. So they're set here. Cc: Michael D Kinney <michael.d.kin...@intel.com> Cc: Brijesh Singh <brijesh.si...@amd.com> Cc: Erdem Aktas <erdemak...@google.com> Cc: James Bottomley <j...@linux.ibm.com> Cc: Jiewen Yao <jiewen....@intel.com> Cc: Tom Lendacky <thomas.lenda...@amd.com> Cc: Gerd Hoffmann <kra...@redhat.com> Signed-off-by: Min Xu <min.m...@intel.com> --- OvmfPkg/Include/Library/TdxPlatformLib.h | 4 ++-- OvmfPkg/TdxDxe/TdxDxe.c | 12 ++++++++++++ OvmfPkg/TdxDxe/TdxDxe.inf | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/Include/Library/TdxPlatformLib.h b/OvmfPkg/Include/Library/TdxPlatformLib.h index a6118a0edd98..5463a6d7e55e 100644 --- a/OvmfPkg/Include/Library/TdxPlatformLib.h +++ b/OvmfPkg/Include/Library/TdxPlatformLib.h @@ -16,8 +16,8 @@ #include <Library/HobLib.h> #include <IndustryStandard/IntelTdx.h> -#define FW_CFG_NX_STACK_ITEM "opt/ovmf/PcdSetNxForStack" -#define FW_CFG_SYSTEM_STATE_ITEM "etc/system-states" +#define FW_CFG_NX_STACK_ITEM "opt/ovmf/PcdSetNxForStack" +#define FW_CFG_SYSTEM_STATE_ITEM "etc/system-states" /** * Perform Platform initialization. diff --git a/OvmfPkg/TdxDxe/TdxDxe.c b/OvmfPkg/TdxDxe/TdxDxe.c index 36ef5c510771..63b069adefd3 100644 --- a/OvmfPkg/TdxDxe/TdxDxe.c +++ b/OvmfPkg/TdxDxe/TdxDxe.c @@ -24,6 +24,7 @@ #include <Library/HobLib.h> #include <Protocol/Cpu.h> #include <Library/UefiBootServicesTableLib.h> +#include <ConfidentialComputingGuestAttr.h> #include <IndustryStandard/Tdx.h> #include <IndustryStandard/IntelTdx.h> #include <Library/TdxLib.h> @@ -181,6 +182,17 @@ TdxDxeEntryPoint ( SetMmioSharedBit (); + #ifdef INTEL_TDX_FULL_FEATURE + PcdStatus = PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrIntelTdx); + ASSERT_RETURN_ERROR (PcdStatus); + + PcdStatus = PcdSetBoolS (PcdIa32EferChangeAllowed, FALSE); + ASSERT_RETURN_ERROR (PcdStatus); + + PcdStatus = PcdSet64S (PcdTdxSharedBitMask, TdSharedPageMask ()); + ASSERT_RETURN_ERROR (PcdStatus); + #endif + PlatformInfo = (EFI_HOB_PLATFORM_INFO *)GET_GUID_HOB_DATA (GuidHob); // diff --git a/OvmfPkg/TdxDxe/TdxDxe.inf b/OvmfPkg/TdxDxe/TdxDxe.inf index 077769bcf70c..b6335d86edbe 100644 --- a/OvmfPkg/TdxDxe/TdxDxe.inf +++ b/OvmfPkg/TdxDxe/TdxDxe.inf @@ -62,3 +62,6 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber gUefiCpuPkgTokenSpaceGuid.PcdCpuLocalApicBaseAddress gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress + gEfiMdeModulePkgTokenSpaceGuid.PcdIa32EferChangeAllowed + gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr + gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask -- 2.29.2.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#84811): https://edk2.groups.io/g/devel/message/84811 Mute This Topic: https://groups.io/mt/87720801/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-