Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ovmf for openSUSE:Factory checked in
at 2023-03-22 22:29:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ovmf (Old)
and /work/SRC/openSUSE:Factory/.ovmf.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ovmf"
Wed Mar 22 22:29:12 2023 rev:90 rq:1073299 version:202302
Changes:
--------
--- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes 2023-03-17
17:01:09.380703962 +0100
+++ /work/SRC/openSUSE:Factory/.ovmf.new.31432/ovmf.changes 2023-03-22
22:29:14.173768803 +0100
@@ -1,0 +2,7 @@
+Mon Mar 20 13:28:55 UTC 2023 - Joey Lee <j...@suse.com>
+
+- Add ovmf-Revert-OvmfPkg-PlatformPei-Update-ReserveEmuVariable.patch
+ to revert 58eb8517ad7b56574f8f04b770a59a9cbed796c4 patch to prevent
+ booting hangs when SEV + secure boot. (bsc#1209266)
+
+-------------------------------------------------------------------
New:
----
ovmf-Revert-OvmfPkg-PlatformPei-Update-ReserveEmuVariable.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ovmf.spec ++++++
--- /var/tmp/diff_new_pack.kYK2KF/_old 2023-03-22 22:29:15.033773130 +0100
+++ /var/tmp/diff_new_pack.kYK2KF/_new 2023-03-22 22:29:15.041773170 +0100
@@ -62,6 +62,8 @@
Patch13:
%{name}-Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch
# Bug 1205613 - L3: win 2k22 UEFI xen VMs cannot boot in xen after upgrade
Patch14: %{name}-Revert-OvmfPkg-OvmfXen-Set-PcdFSBClock.patch
+# Bug 1209266 - OVMF firmware hangs when booting SEV or SEV-ES guest
+Patch15:
%{name}-Revert-OvmfPkg-PlatformPei-Update-ReserveEmuVariable.patch
BuildRequires: bc
BuildRequires: cross-arm-binutils
BuildRequires: cross-arm-gcc%{gcc_version}
@@ -185,6 +187,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
# add openssl
pushd CryptoPkg/Library/OpensslLib/openssl
++++++ ovmf-Revert-OvmfPkg-PlatformPei-Update-ReserveEmuVariable.patch ++++++
>From 251820bfcd28abecf8a67ee94d82c8ab47547b0b Mon Sep 17 00:00:00 2001
From: Joey Lee <j...@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 <j...@suse.com>
---
OvmfPkg/PlatformPei/Platform.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 148240342b..19677d99e7 100644
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -219,13 +219,24 @@ ReserveEmuVariableNvStore (
EFI_PHYSICAL_ADDRESS VariableStore;
RETURN_STATUS PcdStatus;
- VariableStore =
(EFI_PHYSICAL_ADDRESS)(UINTN)PlatformReserveEmuVariableNvStore ();
- PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore);
-
- #ifdef SECURE_BOOT_FEATURE_ENABLED
- PlatformInitEmuVariableNvStore ((VOID *)(UINTN)VariableStore);
- #endif
-
+ //
+ // 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);
}
--
2.39.2
