IntelFrameworkModulePkg AcpiS3SaveDxe: Consume PcdAcpiS3Enable to control the code

Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Star Zeng 2016-04-07 18:19:28 +08:00 committed by Laszlo Ersek
parent 0b5d1fb2ba
commit e96708de88
2 changed files with 8 additions and 3 deletions

View File

@ -605,8 +605,8 @@ S3Ready (
@param ImageHandle A handle for the image that is initializing this driver @param ImageHandle A handle for the image that is initializing this driver
@param SystemTable A pointer to the EFI system table @param SystemTable A pointer to the EFI system table
@retval EFI_SUCCESS: Driver initialized successfully @retval EFI_SUCCESS Driver initialized successfully
@retval EFI_LOAD_ERROR: Failed to Initialize or has been loaded @retval EFI_UNSUPPORTED Do not support ACPI S3
@retval EFI_OUT_OF_RESOURCES Could not allocate needed resources @retval EFI_OUT_OF_RESOURCES Could not allocate needed resources
**/ **/
@ -619,6 +619,10 @@ InstallAcpiS3Save (
{ {
EFI_STATUS Status; EFI_STATUS Status;
if (!PcdGetBool (PcdAcpiS3Enable)) {
return EFI_UNSUPPORTED;
}
if (!FeaturePcdGet(PcdPlatformCsmSupport)) { if (!FeaturePcdGet(PcdPlatformCsmSupport)) {
// //
// More memory for no CSM tip, because GDT need relocation // More memory for no CSM tip, because GDT need relocation

View File

@ -1,7 +1,7 @@
## @file ## @file
# AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data. # AcpiS3Save module installs ACPI S3 Save protocol to prepare S3 boot data.
# #
# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials are # This program and the accompanying materials are
# licensed and made available under the terms and conditions of the BSD License # licensed and made available under the terms and conditions of the BSD License
@ -77,6 +77,7 @@
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize ## SOMETIMES_CONSUMES gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize ## SOMETIMES_CONSUMES
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3BootScriptStackSize ## CONSUMES gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3BootScriptStackSize ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable ## CONSUMES
[Depex] [Depex]
# #