From: "Chiu, Chasel" <chasel.chiu@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Wu, Hao A" <hao.a.wu@intel.com>,
"Dong, Eric" <eric.dong@intel.com>,
"Desimone, Nathaniel L" <nathaniel.l.desimone@intel.com>,
"Gao, Liming" <liming.gao@intel.com>,
Laszlo Ersek <lersek@redhat.com>,
"Chiu, Chasel" <chasel.chiu@intel.com>
Subject: Re: [edk2-devel] [PATCH v3] MdeModulePkg: Enable/Disable S3BootScript dynamically.
Date: Tue, 1 Oct 2019 00:19:08 +0000 [thread overview]
Message-ID: <3C3EFB470A303B4AB093197B6777CCEC504EE442@PGSMSX112.gar.corp.intel.com> (raw)
In-Reply-To: <15C83C366689EC81.3061@groups.io>
Change pushed: ed9db1b91ceba7d3a24743d4d9314c6fbe11c4b3
Thanks!
Chasel
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Chiu,
> Chasel
> Sent: Friday, September 27, 2019 3:51 PM
> To: devel@edk2.groups.io
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Dong, Eric <eric.dong@intel.com>;
> Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Gao, Liming
> <liming.gao@intel.com>; Laszlo Ersek <lersek@redhat.com>
> Subject: [edk2-devel] [PATCH v3] MdeModulePkg: Enable/Disable
> S3BootScript dynamically.
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2212
>
> In binary model the same binary may have to support both
> S3 enabled and disabled scenarios, however not all DXE drivers linking
> PiDxeS3BootScriptLib can return error to invoke library DESTRUCTOR for
> releasing resource.
>
> To support this usage model below PCD is used to skip S3BootScript
> functions when PCD set to FALSE:
> gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable
>
> Test: Verified on internal platform and S3BootScript
> functions can be skipped by PCD during boot time.
>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
> ---
> MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c | 17
> ++++++++++++++++-
> MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf | 4
> ++--
> 2 files changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> index c116727531..9106e7d0f9 100644
> --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> @@ -1,7 +1,7 @@
> /** @file
> Save the S3 data to S3 boot script.
>
> - Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
> + Copyright (c) 2006 - 2019, Intel Corporation. All rights
> + reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -124,6 +124,7 @@ VOID
> *mRegistrationSmmReadyToLock = NULL;
> BOOLEAN mS3BootScriptTableAllocated =
> FALSE;
> BOOLEAN mS3BootScriptTableSmmAllocated
> = FALSE;
> EFI_SMM_SYSTEM_TABLE2 *mBootScriptSmst = NULL;
> +BOOLEAN mAcpiS3Enable = TRUE;
>
> /**
> This is an internal function to add a terminate node the entry, recalculate
> the table @@ -436,6 +437,12 @@ S3BootScriptLibInitialize (
> BOOLEAN InSmm;
> EFI_PHYSICAL_ADDRESS Buffer;
>
> + if (!PcdGetBool (PcdAcpiS3Enable)) {
> + mAcpiS3Enable = FALSE;
> + DEBUG ((DEBUG_INFO, "%a: Skip S3BootScript because ACPI S3
> disabled.\n", gEfiCallerBaseName));
> + return RETURN_SUCCESS;
> + }
> +
> S3TablePtr =
> (SCRIPT_TABLE_PRIVATE_DATA*)(UINTN)PcdGet64(PcdS3BootScriptTablePrivat
> eDataPtr);
> //
> // The Boot script private data is not be initialized. create it @@ -562,6
> +569,10 @@ S3BootScriptLibDeinitialize ( {
> EFI_STATUS Status;
>
> + if (!mAcpiS3Enable) {
> + return RETURN_SUCCESS;
> + }
> +
> DEBUG ((EFI_D_INFO, "%a() in %a module\n", __FUNCTION__,
> gEfiCallerBaseName));
>
> if (mEventDxeSmmReadyToLock != NULL) { @@ -810,6 +821,10 @@
> S3BootScriptGetEntryAddAddress ( {
> UINT8* NewEntryPtr;
>
> + if (!mAcpiS3Enable) {
> + return NULL;
> + }
> +
> if (mS3BootScriptTablePtr->SmmLocked) {
> //
> // We need check InSmm, because after SmmReadyToLock, only SMM
> driver is allowed to write boot script.
> diff --git
> a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
> b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
> index 517ea69568..2b894c99da 100644
> --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
> +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
> @@ -1,7 +1,7 @@
> ## @file
> # DXE S3 boot script Library.
> #
> -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2006 - 2019, Intel Corporation. All rights
> +reserved.<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -65,4 +65,4 @@
> ## SOMETIMES_PRODUCES
>
> gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr
>
> gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptRuntimeTableReservePa
> geNumber ## CONSUMES
> -
> + gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable
> ## CONSUMES
> --
> 2.13.3.windows.1
>
>
>
next parent reply other threads:[~2019-10-01 0:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <15C83C366689EC81.3061@groups.io>
2019-10-01 0:19 ` Chiu, Chasel [this message]
2019-09-27 7:51 [PATCH v3] MdeModulePkg: Enable/Disable S3BootScript dynamically Chiu, Chasel
2019-09-29 18:40 ` [edk2-devel] " Nate DeSimone
2019-09-30 0:44 ` Dong, Eric
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3C3EFB470A303B4AB093197B6777CCEC504EE442@PGSMSX112.gar.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox