[PATCH 0/5] remove EnterS3WithImmediateWake () from ResetSystemLib

[PATCH 0/5] remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

After a refactor of the capsule update support, EnterS3WithImmediateWake()
was left without any callers in the tree, so remove the declaration and the
various definitions.

Ard Biesheuvel (5):
  MdeModulePkg: remove EnterS3WithImmediateWake () from ResetSystemLib
  PcAtChipsetPkg: remove EnterS3WithImmediateWake () from ResetSystemLib
  UefiPayloadPkg: remove EnterS3WithImmediateWake () from ResetSystemLib
  OvmfPkg: remove EnterS3WithImmediateWake () from ResetSystemLib
  ArmVirtPkg: remove EnterS3WithImmediateWake () from ResetSystemLib

 MdeModulePkg/Include/Library/ResetSystemLib.h                            | 11 -----------
 ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c | 14 --------------
 MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c     | 14 --------------
 MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c               | 13 -------------
 MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c               | 13 -------------
 MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c       | 13 -------------
 OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c                          | 18 ------------------
 PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c                   | 17 -----------------
 UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c                   | 18 ------------------
 9 files changed, 131 deletions(-)

-- 
2.20.1

[PATCH 1/5] MdeModulePkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

EnterS3WithImmediateWake () no longer has any callers, so remove it
from ResetSystemLib.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 MdeModulePkg/Include/Library/ResetSystemLib.h                        | 11 -----------
 MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c | 14 --------------
 MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c           | 13 -------------
 MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c           | 13 -------------
 MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c   | 13 -------------
 5 files changed, 64 deletions(-)

diff --git a/MdeModulePkg/Include/Library/ResetSystemLib.h b/MdeModulePkg/Include/Library/ResetSystemLib.h
index 3b2a098a6082..09ee14540c44 100644
--- a/MdeModulePkg/Include/Library/ResetSystemLib.h
+++ b/MdeModulePkg/Include/Library/ResetSystemLib.h
@@ -51,17 +51,6 @@ ResetShutdown (
   VOID
   );
 
-/**
-  This function causes the system to enter S3 and then wake up immediately.
-
-  If this function returns, it means that the system does not support S3 feature.
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  );
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
diff --git a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
index 8d4c1028e603..33a896bee054 100644
--- a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
+++ b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
@@ -58,20 +58,6 @@ ResetShutdown (
   ASSERT (FALSE);
 }
 
-/**
-  This function causes the system to enter S3 and then wake up immediately.
-
-  If this function returns, it means that the system does not support S3 feature.
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  )
-{
-  ASSERT (FALSE);
-}
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
diff --git a/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c b/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
index a85b6cd9a615..47b814fe8dee 100644
--- a/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
+++ b/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
@@ -57,19 +57,6 @@ ResetShutdown (
   gRT->ResetSystem (EfiResetShutdown, EFI_SUCCESS, 0, NULL);
 }
 
-/**
-  This function causes the system to enter S3 and then wake up immediately.
-
-  If this function returns, it means that the system does not support S3 feature.
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  )
-{
-}
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
diff --git a/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c b/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
index 50297129b7c8..6c8c770ca375 100644
--- a/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
+++ b/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
@@ -57,19 +57,6 @@ ResetShutdown (
   PeiServicesResetSystem2 (EfiResetShutdown, EFI_SUCCESS, 0, NULL);
 }
 
-/**
-  This function causes the system to enter S3 and then wake up immediately.
-
-  If this function returns, it means that the system does not support S3 feature.
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  )
-{
-}
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
diff --git a/MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c b/MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c
index 29b3f7ebd871..f4490180ccf9 100644
--- a/MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c
+++ b/MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c
@@ -62,19 +62,6 @@ ResetShutdown (
   mInternalRT->ResetSystem (EfiResetShutdown, EFI_SUCCESS, 0, NULL);
 }
 
-/**
-  This function causes the system to enter S3 and then wake up immediately.
-
-  If this function returns, it means that the system does not support S3 feature.
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  )
-{
-}
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
-- 
2.20.1

[PATCH 2/5] PcAtChipsetPkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

EnterS3WithImmediateWake () no longer has any callers, so remove it
from ResetSystemLib.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c
index 7fe1663c97df..e42c41c48e18 100644
--- a/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -65,23 +65,6 @@ ResetShutdown (
 }
 
 
-/**
-  Calling this function causes the system to enter a power state for capsule
-  update.
-
-  Reset update should not return, if it returns, it means the system does
-  not support capsule update.
-
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  )
-{
-  ASSERT (FALSE);
-}
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
-- 
2.20.1

[PATCH 3/5] UefiPayloadPkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

EnterS3WithImmediateWake () no longer has any callers, so remove it
from ResetSystemLib.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c b/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
index 3fe3c805afe0..2e4b7fe59261 100644
--- a/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -131,24 +131,6 @@ ResetShutdown (
   ASSERT (FALSE);
 }
 
-/**
-  Calling this function causes the system to enter a power state for capsule
-  update.
-
-  Reset update should not return, if it returns, it means the system does
-  not support capsule update.
-
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  )
-{
-  AcpiPmControl (5);
-  ASSERT (FALSE);
-}
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
-- 
2.20.1

[PATCH 4/5] OvmfPkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

EnterS3WithImmediateWake () no longer has any callers, so remove it
from ResetSystemLib.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c b/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
index 98dd80e33c05..2f2e1293a3ef 100644
--- a/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -101,24 +101,6 @@ ResetShutdown (
 }
 
 
-/**
-  Calling this function causes the system to enter a power state for capsule
-  update.
-
-  Reset update should not return, if it returns, it means the system does
-  not support capsule update.
-
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  )
-{
-  AcpiPmControl (1);
-  ASSERT (FALSE);
-}
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
-- 
2.20.1

[PATCH 5/5] ArmVirtPkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

EnterS3WithImmediateWake () no longer has any callers, so remove it
from ResetSystemLib.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
index fdf49e1d9c7a..9e5b70e2c54c 100644
--- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
+++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
@@ -145,20 +145,6 @@ ResetShutdown (
   }
 }
 
-/**
-  This function causes the system to enter S3 and then wake up immediately.
-
-  If this function returns, it means that the system does not support S3 feature.
-**/
-VOID
-EFIAPI
-EnterS3WithImmediateWake (
-  VOID
-  )
-{
-  // not implemented
-}
-
 /**
   This function causes a systemwide reset. The exact type of the reset is
   defined by the EFI_GUID that follows the Null-terminated Unicode string passed
-- 
2.20.1

Re: [PATCH 4/5] OvmfPkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Laszlo Ersek]

On 01/06/20 16:13, Ard Biesheuvel wrote:
> EnterS3WithImmediateWake () no longer has any callers, so remove it
> from ResetSystemLib.
> 
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c | 18 ------------------
>  1 file changed, 18 deletions(-)
> 
> diff --git a/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c b/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
> index 98dd80e33c05..2f2e1293a3ef 100644
> --- a/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
> +++ b/OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c
> @@ -101,24 +101,6 @@ ResetShutdown (
>  }
>  
>  
> -/**
> -  Calling this function causes the system to enter a power state for capsule
> -  update.
> -
> -  Reset update should not return, if it returns, it means the system does
> -  not support capsule update.
> -
> -**/
> -VOID
> -EFIAPI
> -EnterS3WithImmediateWake (
> -  VOID
> -  )
> -{
> -  AcpiPmControl (1);
> -  ASSERT (FALSE);
> -}
> -
>  /**
>    This function causes a systemwide reset. The exact type of the reset is
>    defined by the EFI_GUID that follows the Null-terminated Unicode string passed
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Re: [PATCH 5/5] ArmVirtPkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Laszlo Ersek]

On 01/06/20 16:13, Ard Biesheuvel wrote:
> EnterS3WithImmediateWake () no longer has any callers, so remove it
> from ResetSystemLib.
> 
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c | 14 --------------
>  1 file changed, 14 deletions(-)
> 
> diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
> index fdf49e1d9c7a..9e5b70e2c54c 100644
> --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
> +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
> @@ -145,20 +145,6 @@ ResetShutdown (
>    }
>  }
>  
> -/**
> -  This function causes the system to enter S3 and then wake up immediately.
> -
> -  If this function returns, it means that the system does not support S3 feature.
> -**/
> -VOID
> -EFIAPI
> -EnterS3WithImmediateWake (
> -  VOID
> -  )
> -{
> -  // not implemented
> -}
> -
>  /**
>    This function causes a systemwide reset. The exact type of the reset is
>    defined by the EFI_GUID that follows the Null-terminated Unicode string passed
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Re: [PATCH 0/5] remove EnterS3WithImmediateWake () from ResetSystemLib

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Sent: Monday, January 6, 2020 11:13 PM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Dong, Guo
> <guo.dong@intel.com>; You, Benjamin <benjamin.you@intel.com>; Ni, Ray
> <ray.ni@intel.com>; Gao, Liming <liming.gao@intel.com>; Wu, Hao A
> <hao.a.wu@intel.com>; lersek@redhat.com; Ard Biesheuvel
> <ard.biesheuvel@linaro.org>
> Subject: [PATCH 0/5] remove EnterS3WithImmediateWake () from
> ResetSystemLib
> 
> After a refactor of the capsule update support,
> EnterS3WithImmediateWake()
> was left without any callers in the tree, so remove the declaration and the
> various definitions.
> 
> Ard Biesheuvel (5):
>   MdeModulePkg: remove EnterS3WithImmediateWake () from
> ResetSystemLib
>   PcAtChipsetPkg: remove EnterS3WithImmediateWake () from
> ResetSystemLib
>   UefiPayloadPkg: remove EnterS3WithImmediateWake () from
> ResetSystemLib
>   OvmfPkg: remove EnterS3WithImmediateWake () from ResetSystemLib
>   ArmVirtPkg: remove EnterS3WithImmediateWake () from ResetSystemLib
> 
>  MdeModulePkg/Include/Library/ResetSystemLib.h                            | 11 --------
> ---
> 
> ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.
> c | 14 --------------
> 
> MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
> | 14 --------------
>  MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c               |
> 13 -------------
>  MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c               |
> 13 -------------
>  MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c
> | 13 -------------
>  OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c                          | 18 --------
> ----------
>  PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c                   | 17 ----
> -------------
>  UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c                   | 18 ----
> --------------
>  9 files changed, 131 deletions(-)
> 
> --
> 2.20.1

Re: [PATCH 3/5] UefiPayloadPkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Guo Dong]

Reviewed-by: Guo Dong <guo.dong@intel.com>

> -----Original Message-----
> From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Sent: Monday, January 6, 2020 8:13 AM
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; Dong, Guo <guo.dong@intel.com>;
> You, Benjamin <benjamin.you@intel.com>; Ni, Ray <ray.ni@intel.com>; Gao,
> Liming <liming.gao@intel.com>; Wu, Hao A <hao.a.wu@intel.com>;
> lersek@redhat.com; Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Subject: [PATCH 3/5] UefiPayloadPkg: remove EnterS3WithImmediateWake ()
> from ResetSystemLib
> 
> EnterS3WithImmediateWake () no longer has any callers, so remove it from
> ResetSystemLib.
> 
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c | 18 ------------------
>  1 file changed, 18 deletions(-)
> 
> diff --git a/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
> b/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
> index 3fe3c805afe0..2e4b7fe59261 100644
> --- a/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
> +++ b/UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c
> @@ -131,24 +131,6 @@ ResetShutdown (
>    ASSERT (FALSE);
>  }
> 
> -/**
> -  Calling this function causes the system to enter a power state for capsule
> -  update.
> -
> -  Reset update should not return, if it returns, it means the system does
> -  not support capsule update.
> -
> -**/
> -VOID
> -EFIAPI
> -EnterS3WithImmediateWake (
> -  VOID
> -  )
> -{
> -  AcpiPmControl (5);
> -  ASSERT (FALSE);
> -}
> -
>  /**
>    This function causes a systemwide reset. The exact type of the reset is
>    defined by the EFI_GUID that follows the Null-terminated Unicode string
> passed
> --
> 2.20.1

Re: [PATCH 1/5] MdeModulePkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

On Mon, 6 Jan 2020 at 16:13, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>
> EnterS3WithImmediateWake () no longer has any callers, so remove it
> from ResetSystemLib.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Ping?

> ---
>  MdeModulePkg/Include/Library/ResetSystemLib.h                        | 11 -----------
>  MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c | 14 --------------
>  MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c           | 13 -------------
>  MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c           | 13 -------------
>  MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c   | 13 -------------
>  5 files changed, 64 deletions(-)
>
> diff --git a/MdeModulePkg/Include/Library/ResetSystemLib.h b/MdeModulePkg/Include/Library/ResetSystemLib.h
> index 3b2a098a6082..09ee14540c44 100644
> --- a/MdeModulePkg/Include/Library/ResetSystemLib.h
> +++ b/MdeModulePkg/Include/Library/ResetSystemLib.h
> @@ -51,17 +51,6 @@ ResetShutdown (
>    VOID
>    );
>
> -/**
> -  This function causes the system to enter S3 and then wake up immediately.
> -
> -  If this function returns, it means that the system does not support S3 feature.
> -**/
> -VOID
> -EFIAPI
> -EnterS3WithImmediateWake (
> -  VOID
> -  );
> -
>  /**
>    This function causes a systemwide reset. The exact type of the reset is
>    defined by the EFI_GUID that follows the Null-terminated Unicode string passed
> diff --git a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
> index 8d4c1028e603..33a896bee054 100644
> --- a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
> +++ b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
> @@ -58,20 +58,6 @@ ResetShutdown (
>    ASSERT (FALSE);
>  }
>
> -/**
> -  This function causes the system to enter S3 and then wake up immediately.
> -
> -  If this function returns, it means that the system does not support S3 feature.
> -**/
> -VOID
> -EFIAPI
> -EnterS3WithImmediateWake (
> -  VOID
> -  )
> -{
> -  ASSERT (FALSE);
> -}
> -
>  /**
>    This function causes a systemwide reset. The exact type of the reset is
>    defined by the EFI_GUID that follows the Null-terminated Unicode string passed
> diff --git a/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c b/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
> index a85b6cd9a615..47b814fe8dee 100644
> --- a/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
> +++ b/MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c
> @@ -57,19 +57,6 @@ ResetShutdown (
>    gRT->ResetSystem (EfiResetShutdown, EFI_SUCCESS, 0, NULL);
>  }
>
> -/**
> -  This function causes the system to enter S3 and then wake up immediately.
> -
> -  If this function returns, it means that the system does not support S3 feature.
> -**/
> -VOID
> -EFIAPI
> -EnterS3WithImmediateWake (
> -  VOID
> -  )
> -{
> -}
> -
>  /**
>    This function causes a systemwide reset. The exact type of the reset is
>    defined by the EFI_GUID that follows the Null-terminated Unicode string passed
> diff --git a/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c b/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
> index 50297129b7c8..6c8c770ca375 100644
> --- a/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
> +++ b/MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c
> @@ -57,19 +57,6 @@ ResetShutdown (
>    PeiServicesResetSystem2 (EfiResetShutdown, EFI_SUCCESS, 0, NULL);
>  }
>
> -/**
> -  This function causes the system to enter S3 and then wake up immediately.
> -
> -  If this function returns, it means that the system does not support S3 feature.
> -**/
> -VOID
> -EFIAPI
> -EnterS3WithImmediateWake (
> -  VOID
> -  )
> -{
> -}
> -
>  /**
>    This function causes a systemwide reset. The exact type of the reset is
>    defined by the EFI_GUID that follows the Null-terminated Unicode string passed
> diff --git a/MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c b/MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c
> index 29b3f7ebd871..f4490180ccf9 100644
> --- a/MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c
> +++ b/MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c
> @@ -62,19 +62,6 @@ ResetShutdown (
>    mInternalRT->ResetSystem (EfiResetShutdown, EFI_SUCCESS, 0, NULL);
>  }
>
> -/**
> -  This function causes the system to enter S3 and then wake up immediately.
> -
> -  If this function returns, it means that the system does not support S3 feature.
> -**/
> -VOID
> -EFIAPI
> -EnterS3WithImmediateWake (
> -  VOID
> -  )
> -{
> -}
> -
>  /**
>    This function causes a systemwide reset. The exact type of the reset is
>    defined by the EFI_GUID that follows the Null-terminated Unicode string passed
> --
> 2.20.1
>

Re: [PATCH 1/5] MdeModulePkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Laszlo Ersek]

On 01/08/20 19:51, Ard Biesheuvel wrote:
> On Mon, 6 Jan 2020 at 16:13, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>>
>> EnterS3WithImmediateWake () no longer has any callers, so remove it
>> from ResetSystemLib.
>>
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> 
> Ping?
> 
>> ---
>>  MdeModulePkg/Include/Library/ResetSystemLib.h                        | 11 -----------
>>  MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c | 14 --------------
>>  MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c           | 13 -------------
>>  MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c           | 13 -------------
>>  MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c   | 13 -------------
>>  5 files changed, 64 deletions(-)

For this set of files, "BaseTools/Scripts/GetMaintainer.py" lists:

  Hao A Wu <hao.a.wu@intel.com>
  Jian J Wang <jian.j.wang@intel.com>
  Ray Ni <ray.ni@intel.com>
  Zhichao Gao <zhichao.gao@intel.com>

I'm updating the CC list accordingly.

Thanks
Laszlo

Re: [PATCH 1/5] MdeModulePkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Ni, Ray]

I remember that I have given Reviewed-by. Have I?

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Thursday, January 9, 2020 8:56 PM
> To: Ard Biesheuvel <ard.biesheuvel@linaro.org>; edk2-devel-groups-io <devel@edk2.groups.io>
> Cc: Ni, Ray <ray.ni@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Wang, Jian J <jian.j.wang@intel.com>; Gao, Zhichao
> <zhichao.gao@intel.com>
> Subject: Re: [PATCH 1/5] MdeModulePkg: remove EnterS3WithImmediateWake () from ResetSystemLib
> 
> On 01/08/20 19:51, Ard Biesheuvel wrote:
> > On Mon, 6 Jan 2020 at 16:13, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> >>
> >> EnterS3WithImmediateWake () no longer has any callers, so remove it
> >> from ResetSystemLib.
> >>
> >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >
> > Ping?
> >
> >> ---
> >>  MdeModulePkg/Include/Library/ResetSystemLib.h                        | 11 -----------
> >>  MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c | 14 --------------
> >>  MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c           | 13 -------------
> >>  MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c           | 13 -------------
> >>  MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c   | 13 -------------
> >>  5 files changed, 64 deletions(-)
> 
> For this set of files, "BaseTools/Scripts/GetMaintainer.py" lists:
> 
>   Hao A Wu <hao.a.wu@intel.com>
>   Jian J Wang <jian.j.wang@intel.com>
>   Ray Ni <ray.ni@intel.com>
>   Zhichao Gao <zhichao.gao@intel.com>
> 
> I'm updating the CC list accordingly.
> 
> Thanks
> Laszlo

Re: [PATCH 1/5] MdeModulePkg: remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

On Fri, 10 Jan 2020 at 02:21, Ni, Ray <ray.ni@intel.com> wrote:
>
> I remember that I have given Reviewed-by. Have I?
>

Indeed. MdeModulePkg only has so many entries in Maintainers now that
I failed to spot that you were responding to both PcAtChipsetPkg and
MdeModulePkg.

Thanks,


> > -----Original Message-----
> > From: Laszlo Ersek <lersek@redhat.com>
> > Sent: Thursday, January 9, 2020 8:56 PM
> > To: Ard Biesheuvel <ard.biesheuvel@linaro.org>; edk2-devel-groups-io <devel@edk2.groups.io>
> > Cc: Ni, Ray <ray.ni@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Wang, Jian J <jian.j.wang@intel.com>; Gao, Zhichao
> > <zhichao.gao@intel.com>
> > Subject: Re: [PATCH 1/5] MdeModulePkg: remove EnterS3WithImmediateWake () from ResetSystemLib
> >
> > On 01/08/20 19:51, Ard Biesheuvel wrote:
> > > On Mon, 6 Jan 2020 at 16:13, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> > >>
> > >> EnterS3WithImmediateWake () no longer has any callers, so remove it
> > >> from ResetSystemLib.
> > >>
> > >> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > >
> > > Ping?
> > >
> > >> ---
> > >>  MdeModulePkg/Include/Library/ResetSystemLib.h                        | 11 -----------
> > >>  MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c | 14 --------------
> > >>  MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c           | 13 -------------
> > >>  MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c           | 13 -------------
> > >>  MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c   | 13 -------------
> > >>  5 files changed, 64 deletions(-)
> >
> > For this set of files, "BaseTools/Scripts/GetMaintainer.py" lists:
> >
> >   Hao A Wu <hao.a.wu@intel.com>
> >   Jian J Wang <jian.j.wang@intel.com>
> >   Ray Ni <ray.ni@intel.com>
> >   Zhichao Gao <zhichao.gao@intel.com>
> >
> > I'm updating the CC list accordingly.
> >
> > Thanks
> > Laszlo
>

Re: [PATCH 0/5] remove EnterS3WithImmediateWake () from ResetSystemLib

[Ard Biesheuvel]

On Tue, 7 Jan 2020 at 03:05, Ni, Ray <ray.ni@intel.com> wrote:
>
> Reviewed-by: Ray Ni <ray.ni@intel.com>
>

Series pushed, thanks all.

> > -----Original Message-----
> > From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Sent: Monday, January 6, 2020 11:13 PM
> > To: devel@edk2.groups.io
> > Cc: Ma, Maurice <maurice.ma@intel.com>; Dong, Guo
> > <guo.dong@intel.com>; You, Benjamin <benjamin.you@intel.com>; Ni, Ray
> > <ray.ni@intel.com>; Gao, Liming <liming.gao@intel.com>; Wu, Hao A
> > <hao.a.wu@intel.com>; lersek@redhat.com; Ard Biesheuvel
> > <ard.biesheuvel@linaro.org>
> > Subject: [PATCH 0/5] remove EnterS3WithImmediateWake () from
> > ResetSystemLib
> >
> > After a refactor of the capsule update support,
> > EnterS3WithImmediateWake()
> > was left without any callers in the tree, so remove the declaration and the
> > various definitions.
> >
> > Ard Biesheuvel (5):
> >   MdeModulePkg: remove EnterS3WithImmediateWake () from
> > ResetSystemLib
> >   PcAtChipsetPkg: remove EnterS3WithImmediateWake () from
> > ResetSystemLib
> >   UefiPayloadPkg: remove EnterS3WithImmediateWake () from
> > ResetSystemLib
> >   OvmfPkg: remove EnterS3WithImmediateWake () from ResetSystemLib
> >   ArmVirtPkg: remove EnterS3WithImmediateWake () from ResetSystemLib
> >
> >  MdeModulePkg/Include/Library/ResetSystemLib.h                            | 11 --------
> > ---
> >
> > ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.
> > c | 14 --------------
> >
> > MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.c
> > | 14 --------------
> >  MdeModulePkg/Library/DxeResetSystemLib/DxeResetSystemLib.c               |
> > 13 -------------
> >  MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.c               |
> > 13 -------------
> >  MdeModulePkg/Library/RuntimeResetSystemLib/RuntimeResetSystemLib.c
> > | 13 -------------
> >  OvmfPkg/Library/ResetSystemLib/ResetSystemLib.c                          | 18 --------
> > ----------
> >  PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c                   | 17 ----
> > -------------
> >  UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.c                   | 18 ----
> > --------------
> >  9 files changed, 131 deletions(-)
> >
> > --
> > 2.20.1
>