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

OvmfPkg/AmdSev/SecretDxe: make secret location naming generic 

It is anticipated that this part of the code will work for both Intel
TDX and AMD SEV, so remove the SEV specific naming and change to
ConfidentialComputing as a more architecture neutral prefix. Apart
from the symbol rename, there are no code changes.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Message-Id: <20201216014146.2229-3-jejb@linux.ibm.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
James Bottomley 2020-12-15 17:41:46 -08:00 committed by mergify[bot]
parent caf8b3872a
commit 96201ae7bf
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OvmfPkg/AmdSev/SecretDxe/SecretDxe.c
View File

@ -6,9 +6,9 @@
**/
#include <PiDxe.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Guid/SevLaunchSecret.h>
#include <Guid/ConfidentialComputingSecret.h>
STATIC SEV_LAUNCH_SECRET_LOCATION mSecretDxeTable = {
STATIC CONFIDENTIAL_COMPUTING_SECRET_LOCATION mSecretDxeTable = {
FixedPcdGet32 (PcdSevLaunchSecretBase),
FixedPcdGet32 (PcdSevLaunchSecretSize),
};
@ -21,7 +21,7 @@ InitializeSecretDxe(
)
{
return gBS->InstallConfigurationTable (
&gSevLaunchSecretGuid,
&gConfidentialComputingSecretGuid,
&mSecretDxeTable
);
}

2
OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf
View File

@ -27,7 +27,7 @@
UefiDriverEntryPoint
[Guids]
gSevLaunchSecretGuid
gConfidentialComputingSecretGuid
[FixedPcd]
gUefiOvmfPkgTokenSpaceGuid.PcdSevLaunchSecretBase

10
OvmfPkg/Include/Guid/SevLaunchSecret.h → OvmfPkg/Include/Guid/ConfidentialComputingSecret.h
View File

@ -6,12 +6,12 @@
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef SEV_LAUNCH_SECRET_H_
#define SEV_LAUNCH_SECRET_H_
#ifndef CONFIDENTIAL_COMPUTING_SECRET_H_
#define CONFIDENTIAL_COMPUTING_SECRET_H_
#include <Uefi/UefiBaseType.h>
#define SEV_LAUNCH_SECRET_GUID \
#define CONFIDENTIAL_COMPUTING_SECRET_GUID \
{ 0xadf956ad, \
0xe98c, \
0x484c, \
@ -21,8 +21,8 @@
typedef struct {
UINT64 Base;
UINT64 Size;
} SEV_LAUNCH_SECRET_LOCATION;
} CONFIDENTIAL_COMPUTING_SECRET_LOCATION;
extern EFI_GUID gSevLaunchSecretGuid;
extern EFI_GUID gConfidentialComputingSecretGuid;
#endif // SEV_LAUNCH_SECRET_H_

2
OvmfPkg/OvmfPkg.dec
View File

@ -117,7 +117,7 @@
gLinuxEfiInitrdMediaGuid = {0x5568e427, 0x68fc, 0x4f3d, {0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68}}
gQemuKernelLoaderFsMediaGuid = {0x1428f772, 0xb64a, 0x441e, {0xb8, 0xc3, 0x9e, 0xbd, 0xd7, 0xf8, 0x93, 0xc7}}
gGrubFileGuid = {0xb5ae312c, 0xbc8a, 0x43b1, {0x9c, 0x62, 0xeb, 0xb8, 0x26, 0xdd, 0x5d, 0x07}}
gSevLaunchSecretGuid = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}}
gConfidentialComputingSecretGuid = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}}
[Ppis]
# PPI whose presence in the PPI database signals that the TPM base address