From 3f28aa2fb07f57afa58d4030d6dc60f5d01d5888 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy Date: Tue, 22 Nov 2022 16:12:55 +1100 Subject: [PATCH] MdePkg: Add AMD SEV features to PcdConfidentialComputingGuestAttr PcdConfidentialComputingGuestAttr so far only contained an SEV mode bit but there are more other features which do not translate to levels such as DebugVirtualization or SecureTsc. Add the feature mask and the DebugVirtualization feature bit to the PCD. Cc: Liming Gao Cc: Michael D Kinney Cc: Zhiguang Liu Reviewed-by: Tom Lendacky Signed-off-by: Alexey Kardashevskiy --- Changes: v4: * s/CCAttrFeatureAmdSevDebugSwap/CCAttrFeatureAmdSevEsDebugVirtualization/ v2: * expanded features mask * added type mask --- MdePkg/Include/ConfidentialComputingGuestAttr.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/MdePkg/Include/ConfidentialComputingGuestAttr.h b/MdePkg/Include/ConfidentialComputingGuestAttr.h index 44e6df8002..f62158f77e 100644 --- a/MdePkg/Include/ConfidentialComputingGuestAttr.h +++ b/MdePkg/Include/ConfidentialComputingGuestAttr.h @@ -29,9 +29,20 @@ typedef enum { /* The guest is running with Intel TDX memory encryption enabled. */ CCAttrIntelTdx = 0x200, + + CCAttrTypeMask = 0x000000000000ffff, + + /* Features */ + + /* The AMD SEV-ES DebugVirtualization feature is enabled in SEV_STATUS */ + CCAttrFeatureAmdSevEsDebugVirtualization = 0x0000000000010000, + + CCAttrFeatureMask = 0xffffffffffff0000, } CONFIDENTIAL_COMPUTING_GUEST_ATTR; -#define CC_GUEST_IS_TDX(x) ((x) == CCAttrIntelTdx) -#define CC_GUEST_IS_SEV(x) ((x) == CCAttrAmdSev || (x) == CCAttrAmdSevEs || (x) == CCAttrAmdSevSnp) +#define _CC_GUEST_IS_TDX(x) ((x) == CCAttrIntelTdx) +#define CC_GUEST_IS_TDX(x) _CC_GUEST_IS_TDX((x) & CCAttrTypeMask) +#define _CC_GUEST_IS_SEV(x) ((x) == CCAttrAmdSev || (x) == CCAttrAmdSevEs || (x) == CCAttrAmdSevSnp) +#define CC_GUEST_IS_SEV(x) _CC_GUEST_IS_SEV((x) & CCAttrTypeMask) #endif