Cc: Feng Tian <[email protected]>
Cc: Jiewen Yao <[email protected]>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <[email protected]>
---
MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c | 7 +++++--
MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf | 6 +++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
index e4227282c992..a9bca311d4a1 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
@@ -1,7 +1,7 @@
/** @file
Implementation for S3 SMM Boot Script Saver state driver.
- Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -905,7 +905,10 @@ InitializeSmmS3SaveState (
)
{
EFI_HANDLE Handle;
-
+
+ if (!PcdGetBool (PcdAcpiS3Enable)) {
+ return EFI_UNSUPPORTED;
+ }
Handle = NULL;
return gSmst->SmmInstallProtocolInterface (
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
index be9a5619fe7e..f1f264ec43b5 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf
@@ -3,7 +3,7 @@
#
# It will install S3 SMM Save State protocol to store or record various IO
operations to be replayed during an S3 resume.
#
-# Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are
# licensed and made available under the terms and conditions of the BSD License
@@ -47,10 +47,14 @@ [LibraryClasses]
BaseMemoryLib
BaseLib
S3BootScriptLib
+ PcdLib
[Protocols]
gEfiS3SmmSaveStateProtocolGuid ## PRODUCES
+[Pcd]
+ gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES
+
[Depex]
TRUE
--
2.7.0.windows.1
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
