Re: [edk2-devel] [PATCH ovmf v4 5/5] OvmfPkf: Enable AMD SEV-ES DebugVirtualization

["Lendacky, Thomas via groups.io" <thomas.lendacky=amd.com@groups.io>]

On 6/4/24 21:09, Alexey Kardashevskiy wrote:
> Write the feature bit into PcdConfidentialComputingGuestAttr
> and enable DebugVirtualization in PEI, SEC, DXE.
> 
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Erdem Aktas <erdemaktas@google.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Michael Roth <michael.roth@amd.com>
> Cc: Min Xu <min.m.xu@intel.com>
> Cc: Tom Lendacky <thomas.lendacky@amd.com>
> Signed-off-by: Alexey Kardashevskiy <aik@amd.com>

Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>

> ---
> Changes:
> v4:
> * s/DebugSwap/DebugVirtualization/g
> * the feature is enabled here for all modes
> ---
>   OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c |  6 +++++-
>   OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c |  6 +++++-
>   OvmfPkg/PlatformPei/AmdSev.c                                       | 13 ++++++++++---
>   3 files changed, 20 insertions(+), 5 deletions(-)
> 
> diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c
> index 7d823ad639f4..f381b9255bb7 100644
> --- a/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c
> +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLibInternal.c
> @@ -154,5 +154,9 @@ MemEncryptSevEsDebugVirtualizationIsEnabled (
>     VOID
>     )
>   {
> -  return FALSE;
> +  MSR_SEV_STATUS_REGISTER  Msr;
> +
> +  Msr.Uint32 = InternalMemEncryptSevStatus ();
> +
> +  return Msr.Bits.DebugVirtualization ? TRUE : FALSE;
>   }
> diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c
> index 33a326ac1571..946bed2ada13 100644
> --- a/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c
> +++ b/OvmfPkg/Library/BaseMemEncryptSevLib/SecMemEncryptSevLibInternal.c
> @@ -154,7 +154,11 @@ MemEncryptSevEsDebugVirtualizationIsEnabled (
>     VOID
>     )
>   {
> -  return FALSE;
> +  MSR_SEV_STATUS_REGISTER  Msr;
> +
> +  Msr.Uint32 = InternalMemEncryptSevStatus ();
> +
> +  return Msr.Bits.DebugVirtualization ? TRUE : FALSE;
>   }
>   
>   /**
> diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c
> index 88ca14507f5e..8562787035db 100644
> --- a/OvmfPkg/PlatformPei/AmdSev.c
> +++ b/OvmfPkg/PlatformPei/AmdSev.c
> @@ -434,6 +434,7 @@ AmdSevInitialize (
>     )
>   {
>     UINT64         EncryptionMask;
> +  UINT64         CCGuestAttr;
>     RETURN_STATUS  PcdStatus;
>   
>     //
> @@ -517,13 +518,19 @@ AmdSevInitialize (
>     // technology is active.
>     //
>     if (MemEncryptSevSnpIsEnabled ()) {
> -    PcdStatus = PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrAmdSevSnp);
> +    CCGuestAttr = CCAttrAmdSevSnp;
>     } else if (MemEncryptSevEsIsEnabled ()) {
> -    PcdStatus = PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrAmdSevEs);
> +    CCGuestAttr = CCAttrAmdSevEs;
>     } else {
> -    PcdStatus = PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrAmdSev);
> +    CCGuestAttr = CCAttrAmdSev;
>     }
>   
> +  if (MemEncryptSevEsDebugVirtualizationIsEnabled ()) {
> +    CCGuestAttr |= CCAttrFeatureAmdSevEsDebugVirtualization;
> +  }
> +
> +  PcdStatus = PcdSet64S (PcdConfidentialComputingGuestAttr, CCGuestAttr);
> +
>     ASSERT_RETURN_ERROR (PcdStatus);
>   }
>   


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119484): https://edk2.groups.io/g/devel/message/119484
Mute This Topic: https://groups.io/mt/106496092/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-