diff options
| author | Lin, Gary (HPS OE-Linux) <gary.lin@hpe.com> | 2021-08-31 09:31:13 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-08-31 11:07:16 +0000 |
| commit | 28152333bccb778b62e6e97446b28bfa0e92ef82 (patch) | |
| tree | 9bf7de2fa93cd91b2da2c1764ea2097a168e9f38 /OvmfPkg/Library/LockBoxLib | |
| parent | cb0d24637dfdd869618b9635dfb8e3b0746393a6 (diff) | |
| download | edk2-28152333bccb778b62e6e97446b28bfa0e92ef82.tar.gz edk2-28152333bccb778b62e6e97446b28bfa0e92ef82.tar.bz2 edk2-28152333bccb778b62e6e97446b28bfa0e92ef82.zip | |
OvmfPkg/LockBoxLib: use PcdAcpiS3Enable to detect S3 support
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
Signed-off-by: Gary Lin <gary.lin@hpe.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Tested-by: Jim Fehlig <jfehlig@suse.com>
Diffstat (limited to 'OvmfPkg/Library/LockBoxLib')
| -rw-r--r-- | OvmfPkg/Library/LockBoxLib/LockBoxDxe.c | 4 | ||||
| -rw-r--r-- | OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c b/OvmfPkg/Library/LockBoxLib/LockBoxDxe.c index b28ad4d2db..7dc2eea239 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
diff --git a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf index 38bcc57708..9140b1ba9d 100644 --- a/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf +++ b/OvmfPkg/Library/LockBoxLib/LockBoxDxeLib.inf @@ -33,8 +33,6 @@ BaseMemoryLib
DebugLib
UefiBootServicesTableLib
- QemuFwCfgLib
- QemuFwCfgS3Lib
[Protocols]
gEfiLockBoxProtocolGuid ## SOMETIMES_PRODUCES
@@ -42,6 +40,7 @@ [Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize
+ gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable
[FeaturePcd]
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire
|