89 lines
3.6 KiB
Diff
89 lines
3.6 KiB
Diff
|
From 673ed284a598bf94d39f01f118158e55e5c04645 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Roth <michael.roth@amd.com>
|
||
|
|
Date: Wed, 16 Aug 2023 15:11:45 -0500
|
||
|
|
Subject: [PATCH 1/3] OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure
|
||
|
|
during boot
|
||
|
|
|
||
|
|
RH-Author: Gerd Hoffmann <None>
|
||
|
|
RH-MergeRequest: 44: OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure during boot
|
||
|
|
RH-Bugzilla: 2190244
|
||
|
|
RH-Acked-by: Oliver Steffen <osteffen@redhat.com>
|
||
|
|
RH-Commit: [1/1] 44f18b2324cbd4aa1840613d9a8d19f0fbec7b1b (kraxel.rh/centos-src-edk2)
|
||
|
|
|
||
|
|
Booting an SEV guest with AmdSev OVMF package currently triggers the
|
||
|
|
following assertion with QEMU:
|
||
|
|
|
||
|
|
InstallQemuFwCfgTables: installed 7 tables
|
||
|
|
PcRtc: Write 0x20 to CMOS location 0x32
|
||
|
|
[Variable]END_OF_DXE is signaled
|
||
|
|
Initialize variable error flag (FF)
|
||
|
|
|
||
|
|
ASSERT_EFI_ERROR (Status = Not Found)
|
||
|
|
ASSERT [BdsDxe] /home/VT_BUILD/ovmf/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c(1711): !(((INTN)(RETURN_STATUS)(Status)) < 0)
|
||
|
|
|
||
|
|
This seems to be due to commit 81dc0d8b4c, which switched to using
|
||
|
|
PlatformBootManagerLib instead of PlatformBootManagerLibGrub. That
|
||
|
|
pulls in a dependency on gEfiS3SaveStateProtocolGuid provider being
|
||
|
|
available (which is asserted for in
|
||
|
|
BdsPlatform.c:PlatformBootManagerBeforeConsole()/SaveS3BootScript()),
|
||
|
|
but the libraries that provide it aren't currently included in the
|
||
|
|
build. Add them similarly to what's done for OvmfPkg.
|
||
|
|
|
||
|
|
Fixes: 81dc0d8b4c ("OvmfPkg/AmdSev: stop using PlatformBootManagerLibGrub")
|
||
|
|
Cc: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Cc: Ray Ni <ray.ni@intel.com>
|
||
|
|
Cc: Erdem Aktas <erdemaktas@google.com>
|
||
|
|
Cc: James Bottomley <jejb@linux.ibm.com>
|
||
|
|
Cc: Jiewen Yao <jiewen.yao@intel.com>
|
||
|
|
Cc: Min Xu <min.m.xu@intel.com>
|
||
|
|
Cc: Tom Lendacky <thomas.lendacky@amd.com>
|
||
|
|
Signed-off-by: Michael Roth <michael.roth@amd.com>
|
||
|
|
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>
|
||
|
|
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Message-ID: <20230816201146.1634348-2-michael.roth@amd.com>
|
||
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
|
||
|
|
List-Archive: https://edk2.groups.io/g/devel/message/107806
|
||
|
|
---
|
||
|
|
OvmfPkg/AmdSev/AmdSevX64.dsc | 3 +++
|
||
|
|
OvmfPkg/AmdSev/AmdSevX64.fdf | 2 ++
|
||
|
|
2 files changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
index 427df673f3..8d165ed05a 100644
|
||
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
@@ -199,6 +199,7 @@
|
||
|
|
|
||
|
|
SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
|
||
|
|
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
|
||
|
|
+ S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
|
||
|
|
|
||
|
|
!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
|
||
|
|
|
||
|
|
@@ -715,6 +716,8 @@
|
||
|
|
#
|
||
|
|
MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
|
||
|
|
OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
|
||
|
|
+ MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
|
||
|
|
+ MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||
|
|
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
||
|
|
|
||
|
|
#
|
||
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||
|
|
index a48c93e2a5..3e6ee61823 100644
|
||
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||
|
|
@@ -269,6 +269,8 @@ INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
|
||
|
|
|
||
|
|
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
|
||
|
|
INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
|
||
|
|
+INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf
|
||
|
|
+INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
||
|
|
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
||
|
|
|
||
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|