To avoid the potential inconsistency between PcdAcpiS3Enable and QemuFwCfgS3Enabled(), this commit modifies LockBoxLib to detect S3 support by PcdAcpiS3Enable as modules in MdeModulePkg do.
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3573 Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Jiewen Yao <jiewen....@intel.com> cc: Jordan Justen <jordan.l.jus...@intel.com> Cc: Jim Fehlig <jfeh...@suse.com> Cc: Joey Li <j...@suse.com> Signed-off-by: Gary Lin <gary....@hpe.com> Reviewed-by: Philippe Mathieu-Daude <phi...@redhat.com> Reviewed-by: Gerd Hoffmann <kra...@redhat.com> Reviewed-by: Jiewen Yao <jiewen....@intel.com> Tested-by: Jim Fehlig <jfeh...@suse.com> --- v3: - Add the bugzilla link --- OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf | 3 +-- OvmfPkg/Library/LockBoxLib/LockBoxDxe.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf index 38bcc577084a..9140b1ba9de9 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf @@ -33,8 +33,6 @@ [LibraryClasses] BaseMemoryLib DebugLib UefiBootServicesTableLib - QemuFwCfgLib - QemuFwCfgS3Lib [Protocols] gEfiLockBoxProtocolGuid ## SOMETIMES_PRODUCES @@ -42,6 +40,7 @@ [Protocols] [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c index b28ad4d2dba7..7dc2eea2395a 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c @@ -12,8 +12,6 @@ #include <Library/UefiBootServicesTableLib.h> #include <Library/BaseMemoryLib.h> #include <Library/DebugLib.h> -#include <Library/QemuFwCfgLib.h> -#include <Library/QemuFwCfgS3Lib.h> #include <Protocol/LockBox.h> #include <LockBoxLib.h> @@ -117,7 +115,7 @@ LockBoxDxeLibInitialize ( Status = LockBoxLibInitialize (); if (!EFI_ERROR (Status)) { - if (QemuFwCfgS3Enabled ()) { + if (PcdGetBool (PcdAcpiS3Enable)) { // // When S3 enabled, the first driver run with this library linked will // have this library constructor to install LockBox protocol on the -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#79968): https://edk2.groups.io/g/devel/message/79968 Mute This Topic: https://groups.io/mt/85267101/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
