117 lines
4.0 KiB
Diff
117 lines
4.0 KiB
Diff
|
From 4e22a4d1c1d7b492d1e1eee4fa81c697e0d59314 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Date: Fri, 2 Dec 2022 14:09:58 +0100
|
||
|
|
Subject: [PATCH 20/32] 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>
|
||
|
|
(cherry picked from commit 78c373f2a5273af00b23b55d3e8c41583310cfb6)
|
||
|
|
---
|
||
|
|
OvmfPkg/PlatformPei/Platform.h | 2 +-
|
||
|
|
OvmfPkg/PlatformPei/AmdSev.c | 14 +++++++-------
|
||
|
|
OvmfPkg/PlatformPei/Platform.c | 2 +-
|
||
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h
|
||
|
|
index 29b51b2debd8..f245025fb46f 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
|
||
|
|
);
|
||
|
|
|
||
|
|
/**
|
||
|
|
diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c
|
||
|
|
index e1b9fd9b7f68..c23fae7fcae0 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 e5132d95a8f8..14a75d40c005 100644
|
||
|
|
--- a/OvmfPkg/PlatformPei/Platform.c
|
||
|
|
+++ b/OvmfPkg/PlatformPei/Platform.c
|
||
|
|
@@ -392,7 +392,7 @@ InitializePlatform (
|
||
|
|
}
|
||
|
|
|
||
|
|
InstallClearCacheCallback ();
|
||
|
|
- AmdSevInitialize ();
|
||
|
|
+ AmdSevInitialize (&mPlatformInfoHob);
|
||
|
|
if (mPlatformInfoHob.HostBridgeDevId == 0xffff) {
|
||
|
|
MiscInitializationForMicrovm (&mPlatformInfoHob);
|
||
|
|
} else {
|
||
|
|
--
|
||
|
|
2.38.1
|
||
|
|
|