tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/QemuFwCfgDxeLib: use PcdConfidentialComputingGuestAttr 

Check PcdConfidentialComputingGuestAttr instead of calling
MemEncryptSevIsEnabled() and MemEncryptTdxIsEnabled() to figure
whenever SEV or TDX is enabled.

This allows to remove the MemEncryptSevLib + MemEncryptTdxLib
dependencies.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2024-12-04 09:44:54 +01:00 committed by mergify[bot]
parent 194cdc1700
commit 775d6cd7ed
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
View File

@ -56,6 +56,7 @@ QemuFwCfgInitialize (
{ {
UINT32 Signature; UINT32 Signature;
UINT32 Revision; UINT32 Revision;
UINT64 CcGuestAttr;
// //
// Enable the access routines while probing to see if it is supported. // Enable the access routines while probing to see if it is supported.
@ -86,7 +87,10 @@ QemuFwCfgInitialize (
DEBUG ((DEBUG_INFO, "QemuFwCfg interface (DMA) is supported.\n")); DEBUG ((DEBUG_INFO, "QemuFwCfg interface (DMA) is supported.\n"));
} }
if (mQemuFwCfgDmaSupported && (MemEncryptSevIsEnabled () || (MemEncryptTdxIsEnabled ()))) { CcGuestAttr = PcdGet64 (PcdConfidentialComputingGuestAttr);
if (mQemuFwCfgDmaSupported && (CC_GUEST_IS_SEV (CcGuestAttr) ||
CC_GUEST_IS_TDX (CcGuestAttr)))
{
EFI_STATUS Status; EFI_STATUS Status;
// //
@ -415,7 +419,7 @@ InternalQemuFwCfgDmaBytes (
// When SEV or TDX is enabled, map Buffer to DMA address before issuing the DMA // When SEV or TDX is enabled, map Buffer to DMA address before issuing the DMA
// request // request
// //
if (MemEncryptSevIsEnabled () || MemEncryptTdxIsEnabled ()) { if (mIoMmuProtocol != NULL) {
VOID *AccessBuffer; VOID *AccessBuffer;
EFI_PHYSICAL_ADDRESS DataBufferAddress; EFI_PHYSICAL_ADDRESS DataBufferAddress;

5
OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf
View File

@ -42,11 +42,12 @@
DebugLib DebugLib
IoLib IoLib
MemoryAllocationLib MemoryAllocationLib
MemEncryptSevLib
MemEncryptTdxLib
[Protocols] [Protocols]
gEdkiiIoMmuProtocolGuid ## SOMETIMES_CONSUMES gEdkiiIoMmuProtocolGuid ## SOMETIMES_CONSUMES
[Pcd]
gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr
[Depex] [Depex]
gEdkiiIoMmuProtocolGuid OR gIoMmuAbsentProtocolGuid gEdkiiIoMmuProtocolGuid OR gIoMmuAbsentProtocolGuid