Re: [edk2] [PATCH V2 4/4] MdeModulePkg DxeS3BootScriptLib: Revert git commit 058196bbb345

[Laszlo Ersek]

On 06/06/16 12:38, Star Zeng wrote:
> With a destructor implemented, the shortcut from 058196bbb345
> should be unnecessary.
> 
> Cc: Jiewen Yao 
> Cc: Laszlo Ersek 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng 
> Suggested-by: Laszlo Ersek 
> ---
>  MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c   | 4 
>  MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf | 1 -
>  2 files changed, 5 deletions(-)
> 
> diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c 
> b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> index e84195ded547..625d141481fb 100644
> --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
> @@ -443,10 +443,6 @@ S3BootScriptLibInitialize (
>BOOLEANInSmm;
>EFI_PHYSICAL_ADDRESS   Buffer;
>  
> -  if (!PcdGetBool (PcdAcpiS3Enable)) {
> -return RETURN_SUCCESS;
> -  }
> -
>S3TablePtr = 
> (SCRIPT_TABLE_PRIVATE_DATA*)(UINTN)PcdGet64(PcdS3BootScriptTablePrivateDataPtr);
>//
>// The Boot script private data is not be initialized. create it
> diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf 
> b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
> index 0f4151180f6a..de314db47922 100644
> --- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
> +++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
> @@ -71,5 +71,4 @@ [Pcd]
>## SOMETIMES_PRODUCES
>gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr
>
> gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptRuntimeTableReservePageNumber   
> ## CONSUMES
> -  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable 
>## CONSUMES
>  
> 

Reviewed-by: Laszlo Ersek 

I'll provide testing feedback as well, shortly.

Thanks!
Laszlo
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH V2 4/4] MdeModulePkg DxeS3BootScriptLib: Revert git commit 058196bbb345

[Star Zeng]

With a destructor implemented, the shortcut from 058196bbb345
should be unnecessary.

Cc: Jiewen Yao 
Cc: Laszlo Ersek 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng 
Suggested-by: Laszlo Ersek 
---
 MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c   | 4 
 MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf | 1 -
 2 files changed, 5 deletions(-)

diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c 
b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
index e84195ded547..625d141481fb 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
+++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
@@ -443,10 +443,6 @@ S3BootScriptLibInitialize (
   BOOLEANInSmm;
   EFI_PHYSICAL_ADDRESS   Buffer;
 
-  if (!PcdGetBool (PcdAcpiS3Enable)) {
-return RETURN_SUCCESS;
-  }
-
   S3TablePtr = 
(SCRIPT_TABLE_PRIVATE_DATA*)(UINTN)PcdGet64(PcdS3BootScriptTablePrivateDataPtr);
   //
   // The Boot script private data is not be initialized. create it
diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf 
b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
index 0f4151180f6a..de314db47922 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
+++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
@@ -71,5 +71,4 @@ [Pcd]
   ## SOMETIMES_PRODUCES
   gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr
   gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptRuntimeTableReservePageNumber  
 ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable   
 ## CONSUMES
 
-- 
2.7.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel