File ovmf-Revert-OvmfPkg-PlatformPei-Update-ReserveE... of Package ovmf

Overview Repositories Revisions Requests Users Attributes Meta

File ovmf-Revert-OvmfPkg-PlatformPei-Update-ReserveEmuVariable.patch of Package ovmf

From 251820bfcd28abecf8a67ee94d82c8ab47547b0b Mon Sep 17 00:00:00 2001
From: Joey Lee <jlee@suse.com>
Date: Mon, 20 Mar 2023 13:14:57 +0100
Subject: [PATCH] Revert "OvmfPkg/PlatformPei: Update
 ReserveEmuVariableNvStore"

This reverts commit 58eb8517ad7b56574f8f04b770a59a9cbed796c4.
(bsc#1209266)

Signed-off-by: Joey Lee <jlee@suse.com>
---
 OvmfPkg/PlatformPei/Platform.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

Index: edk2-edk2-stable202305/OvmfPkg/PlatformPei/Platform.c
===================================================================
--- edk2-edk2-stable202305.orig/OvmfPkg/PlatformPei/Platform.c
+++ edk2-edk2-stable202305/OvmfPkg/PlatformPei/Platform.c
@@ -219,14 +219,24 @@ ReserveEmuVariableNvStore (
   EFI_PHYSICAL_ADDRESS  VariableStore;
   RETURN_STATUS         PcdStatus;
 
-  VariableStore = (EFI_PHYSICAL_ADDRESS)(UINTN)PlatformReserveEmuVariableNvStore ();
-  PcdStatus     = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);
-
-  if (FeaturePcdGet (PcdSecureBootSupported)) {
-    // restore emulated VarStore from pristine ROM copy
-    PlatformInitEmuVariableNvStore ((VOID *)(UINTN)VariableStore);
-  }
-
+  //
+  // Allocate storage for NV variables early on so it will be
+  // at a consistent address.  Since VM memory is preserved
+  // across reboots, this allows the NV variable storage to survive
+  // a VM reboot.
+  //
+  VariableStore =
+    (EFI_PHYSICAL_ADDRESS)(UINTN)
+    AllocateRuntimePages (
+      EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))
+      );
+  DEBUG ((
+    DEBUG_INFO,
+    "Reserved variable store memory: 0x%lX; size: %dkb\n",
+    VariableStore,
+    (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024
+    ));
+  PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);
   ASSERT_RETURN_ERROR (PcdStatus);
 }

Places

File ovmf-Revert-OvmfPkg-PlatformPei-Update-ReserveEmuVariable.patch of Package ovmf

Places