diff --git a/OvmfPkg/Include/Library/PlatformInitLib.h b/OvmfPkg/Include/Library/PlatformInitLib.h index c88f83a2a8..36f23e37ac 100644 --- a/OvmfPkg/Include/Library/PlatformInitLib.h +++ b/OvmfPkg/Include/Library/PlatformInitLib.h @@ -57,7 +57,6 @@ typedef struct { BOOLEAN QemuFwCfgDmaSupported; UINT64 PteMemoryEncryptionAddressOrMask; - UINT64 TdxSharedBitMask; UINT64 GhcbBase; } EFI_HOB_PLATFORM_INFO; #pragma pack() diff --git a/OvmfPkg/PlatformPei/IntelTdx.c b/OvmfPkg/PlatformPei/IntelTdx.c index 86a36310df..207b85de74 100644 --- a/OvmfPkg/PlatformPei/IntelTdx.c +++ b/OvmfPkg/PlatformPei/IntelTdx.c @@ -52,7 +52,7 @@ IntelTdxInitialize ( PcdStatus = PcdSet64S (PcdTdxSharedBitMask, PageMask); ASSERT_RETURN_ERROR (PcdStatus); - PlatformInfoHob->TdxSharedBitMask = PageMask; + PlatformInfoHob->PcdTdxSharedBitMask = PageMask; PcdStatus = PcdSetBoolS (PcdSetNxForStack, TRUE); ASSERT_RETURN_ERROR (PcdStatus); diff --git a/UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c b/UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c index f59ceaaed2..ad2c79cd64 100644 --- a/UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c +++ b/UefiCpuPkg/Library/CpuArchLib/CpuPageTable.c @@ -310,7 +310,7 @@ GetPageTableEntry ( // AddressEncMask = mPlatformInfoHob2->PteMemoryEncryptionAddressOrMask & PAGING_1G_ADDRESS_MASK_64; if (AddressEncMask == 0) { - AddressEncMask = mPlatformInfoHob2->TdxSharedBitMask & PAGING_1G_ADDRESS_MASK_64; + AddressEncMask = mPlatformInfoHob2->PcdTdxSharedBitMask & PAGING_1G_ADDRESS_MASK_64; } if (PagingContext->MachineType == IMAGE_FILE_MACHINE_X64) {