tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/SmmControl2Dxe: use PcdAcpiS3Enable to detect S3 support 

To avoid the potential inconsistency between PcdAcpiS3Enable and
QemuFwCfgS3Enabled(), this commit modifies SmmControl2Dxe 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: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Tested-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Lin, Gary (HPS OE-Linux) 2021-08-31 09:31:15 +08:00 committed by mergify[bot]
parent 52e2dabc0f
commit 5b5f10d746
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c
View File

@ -25,8 +25,6 @@
#include <Library/IoLib.h> #include <Library/IoLib.h>
#include <Library/PcdLib.h> #include <Library/PcdLib.h>
#include <Library/PciLib.h> #include <Library/PciLib.h>
#include <Library/QemuFwCfgLib.h>
#include <Library/QemuFwCfgS3Lib.h>
#include <Library/UefiBootServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>
#include <Protocol/S3SaveState.h> #include <Protocol/S3SaveState.h>
#include <Protocol/SmmControl2.h> #include <Protocol/SmmControl2.h>
@ -238,7 +236,7 @@ SmmControl2DxeEntryPoint (
// //
mSmiFeatureNegotiation = NegotiateSmiFeatures (); mSmiFeatureNegotiation = NegotiateSmiFeatures ();
if (QemuFwCfgS3Enabled ()) { if (PcdGetBool (PcdAcpiS3Enable)) {
VOID *Registration; VOID *Registration;
// //

2
OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf
View File

@ -39,6 +39,7 @@
[Packages] [Packages]
MdePkg/MdePkg.dec MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
OvmfPkg/OvmfPkg.dec OvmfPkg/OvmfPkg.dec
UefiCpuPkg/UefiCpuPkg.dec UefiCpuPkg/UefiCpuPkg.dec
@ -62,6 +63,7 @@
[Pcd] [Pcd]
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout ## SOMETIMES_PRODUCES gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout ## SOMETIMES_PRODUCES
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode ## SOMETIMES_PRODUCES gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode ## SOMETIMES_PRODUCES
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable
[FeaturePcd] [FeaturePcd]
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire