1. Patchew
  2. EDK2
  3. [edk2-devel] [0/2] Fixes for AmdSev OVMF package regressions
  4. View patch

[edk2-devel] [PATCH 1/2] OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure during boot

Roth, Michael via groups.io posted 2 patches 2 years, 5 months ago
[edk2-devel] [PATCH 1/2] OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure during boot
Posted by Roth, Michael via groups.io 2 years, 5 months ago 
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>
---
 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 2c6ed7c974..f43300a95e 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -200,6 +200,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

 

@@ -709,6 +710,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 463bd3e9ef..b2ab0c7773 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
@@ -270,6 +270,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.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107806): https://edk2.groups.io/g/devel/message/107806
Mute This Topic: https://groups.io/mt/100787519/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/2] OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure during boot
Posted by Gerd Hoffmann 2 years, 5 months ago 
On Wed, Aug 16, 2023 at 03:11:45PM -0500, Michael Roth wrote:
> 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: Gerd Hoffmann <kraxel@redhat.com>

should be added to the stable tag.

take care,
  Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107916): https://edk2.groups.io/g/devel/message/107916
Mute This Topic: https://groups.io/mt/100787519/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 1/2] OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure during boot
Posted by Yao, Jiewen 2 years, 5 months ago 
Acked-by: Jiewen Yao <Jiewen.yao@intel.com>

> -----Original Message-----
> From: Gerd Hoffmann <kraxel@redhat.com>
> Sent: Monday, August 21, 2023 11:29 PM
> To: Michael Roth <michael.roth@amd.com>
> Cc: devel@edk2.groups.io; Ni, Ray <ray.ni@intel.com>; Aktas, Erdem
> <erdemaktas@google.com>; James Bottomley <jejb@linux.ibm.com>; Yao,
> Jiewen <jiewen.yao@intel.com>; Xu, Min M <min.m.xu@intel.com>; Tom
> Lendacky <thomas.lendacky@amd.com>
> Subject: Re: [PATCH 1/2] OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure
> during boot
> 
> On Wed, Aug 16, 2023 at 03:11:45PM -0500, Michael Roth wrote:
> > 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: Gerd Hoffmann <kraxel@redhat.com>
> 
> should be added to the stable tag.
> 
> take care,
>   Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107923): https://edk2.groups.io/g/devel/message/107923
Mute This Topic: https://groups.io/mt/100787519/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.