diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2022-12-02 14:09:58 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2022-12-14 17:45:41 +0000 |
| commit | 78c373f2a5273af00b23b55d3e8c41583310cfb6 (patch) | |
| tree | d33d27c8eb1d98f53edd658dbcb5bb63a3e682c0 | |
| parent | 916825b84f23b691dcce09a57625fb8fcb0cbb48 (diff) | |
| download | edk2-78c373f2a5273af00b23b55d3e8c41583310cfb6.tar.gz edk2-78c373f2a5273af00b23b55d3e8c41583310cfb6.tar.bz2 edk2-78c373f2a5273af00b23b55d3e8c41583310cfb6.zip | |
OvmfPkg/PlatformPei: AmdSev: stop using mPlatformInfoHob
Stop using the mPlatformInfoHob global variable in AmdSevInitialize()
and AmdSevEsInitialize() functions. Pass a pointer to the
PlatformInfoHob instead.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Tom Lendacky <thomas.lendacky@amd.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
| -rw-r--r-- | OvmfPkg/PlatformPei/AmdSev.c | 14 | ||||
| -rw-r--r-- | OvmfPkg/PlatformPei/Platform.c | 2 | ||||
| -rw-r--r-- | OvmfPkg/PlatformPei/Platform.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index e1b9fd9b7f..c23fae7fca 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -201,7 +201,7 @@ GhcbRegister ( STATIC
VOID
AmdSevEsInitialize (
- VOID
+ IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob
)
{
UINT8 *GhcbBase;
@@ -228,7 +228,7 @@ AmdSevEsInitialize ( // Since the pages must survive across the UEFI to OS transition
// make them reserved.
//
- GhcbPageCount = mPlatformInfoHob.PcdCpuMaxLogicalProcessorNumber * 2;
+ GhcbPageCount = PlatformInfoHob->PcdCpuMaxLogicalProcessorNumber * 2;
GhcbBase = AllocateReservedPages (GhcbPageCount);
ASSERT (GhcbBase != NULL);
@@ -266,7 +266,7 @@ AmdSevEsInitialize ( // Allocate #VC recursion backup pages. The number of backup pages needed is
// one less than the maximum VC count.
//
- GhcbBackupPageCount = mPlatformInfoHob.PcdCpuMaxLogicalProcessorNumber * (VMGEXIT_MAXIMUM_VC_COUNT - 1);
+ GhcbBackupPageCount = PlatformInfoHob->PcdCpuMaxLogicalProcessorNumber * (VMGEXIT_MAXIMUM_VC_COUNT - 1);
GhcbBackupBase = AllocatePages (GhcbBackupPageCount);
ASSERT (GhcbBackupBase != NULL);
@@ -320,7 +320,7 @@ AmdSevEsInitialize ( **/
VOID
AmdSevInitialize (
- VOID
+ IN OUT EFI_HOB_PLATFORM_INFO *PlatformInfoHob
)
{
UINT64 EncryptionMask;
@@ -367,7 +367,7 @@ AmdSevInitialize ( // until after re-encryption, in order to prevent an information leak to the
// hypervisor.
//
- if (mPlatformInfoHob.SmmSmramRequire && (mPlatformInfoHob.BootMode != BOOT_ON_S3_RESUME)) {
+ if (PlatformInfoHob->SmmSmramRequire && (PlatformInfoHob->BootMode != BOOT_ON_S3_RESUME)) {
RETURN_STATUS LocateMapStatus;
UINTN MapPagesBase;
UINTN MapPagesCount;
@@ -378,7 +378,7 @@ AmdSevInitialize ( );
ASSERT_RETURN_ERROR (LocateMapStatus);
- if (mPlatformInfoHob.Q35SmramAtDefaultSmbase) {
+ if (PlatformInfoHob->Q35SmramAtDefaultSmbase) {
//
// The initial SMRAM Save State Map has been covered as part of a larger
// reserved memory allocation in InitializeRamRegions().
@@ -400,7 +400,7 @@ AmdSevInitialize ( //
// Check and perform SEV-ES initialization if required.
//
- AmdSevEsInitialize ();
+ AmdSevEsInitialize (PlatformInfoHob);
//
// Set the Confidential computing attr PCD to communicate which SEV
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index b1f8140d60..f2c1e2b213 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -379,7 +379,7 @@ InitializePlatform ( }
InstallClearCacheCallback ();
- AmdSevInitialize ();
+ AmdSevInitialize (&mPlatformInfoHob);
if (mPlatformInfoHob.HostBridgeDevId == 0xffff) {
MiscInitializationForMicrovm (&mPlatformInfoHob);
} else {
diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h index 29b51b2deb..f245025fb4 100644 --- a/OvmfPkg/PlatformPei/Platform.h +++ b/OvmfPkg/PlatformPei/Platform.h @@ -82,7 +82,7 @@ InstallClearCacheCallback ( VOID
AmdSevInitialize (
- VOID
+ IN EFI_HOB_PLATFORM_INFO *PlatformInfoHob
);
/**
|