MdeModulePkg: Rename SmmEndOfS3ResumeProtocolGuid to EndOfS3ResumeGuid

Rename SmmEndOfS3ResumeProtocolGuid to EndOfS3ResumeGuid as the GUID
may be used to install PPI in future to notify PEI phase code.

The references in UefiCpuPkg are also being updated.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
index 4c1e3e7195..0b9c7958c7 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.c
@@ -81,7 +81,7 @@ SMM_CORE_SMI_HANDLERS  mSmmCoreSmiHandlers[] = {
   { SmmExitBootServicesHandler, &gEfiEventExitBootServicesGuid,      NULL, FALSE },

   { SmmReadyToBootHandler,      &gEfiEventReadyToBootGuid,           NULL, FALSE },

   { SmmEndOfDxeHandler,         &gEfiEndOfDxeEventGroupGuid,         NULL, TRUE },

-  { SmmEndOfS3ResumeHandler,    &gEdkiiSmmEndOfS3ResumeProtocolGuid, NULL, FALSE },

+  { SmmEndOfS3ResumeHandler,    &gEdkiiEndOfS3ResumeGuid,            NULL, FALSE },

   { NULL,                       NULL,                                NULL, FALSE }

 };

 

@@ -384,7 +384,7 @@ SmmEndOfDxeHandler (
 }

 

 /**

-  Software SMI handler that is called when the EndOfS3Resume event is trigged.

+  Software SMI handler that is called when the EndOfS3Resume signal is triggered.

   This function installs the SMM EndOfS3Resume Protocol so SMM Drivers are informed that

   S3 resume has finished.

 

@@ -417,19 +417,19 @@ SmmEndOfS3ResumeHandler (
   SmmHandle = NULL;

   Status = SmmInstallProtocolInterface (

              &SmmHandle,

-             &gEdkiiSmmEndOfS3ResumeProtocolGuid,

+             &gEdkiiEndOfS3ResumeGuid,

              EFI_NATIVE_INTERFACE,

              NULL

              );

   ASSERT_EFI_ERROR (Status);

 

   //

-  // Uninstall the protocol here because the comsume just hook the

+  // Uninstall the protocol here because the comsumer just hook the

   // installation event.

   //

   Status = SmmUninstallProtocolInterface (

            SmmHandle,

-           &gEdkiiSmmEndOfS3ResumeProtocolGuid,

+           &gEdkiiEndOfS3ResumeGuid,

            NULL

            );

   ASSERT_EFI_ERROR (Status);

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
index cdc491c324..2729a434d8 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.h
@@ -32,7 +32,6 @@
 #include <Protocol/SmmExitBootServices.h>

 #include <Protocol/SmmLegacyBoot.h>

 #include <Protocol/SmmReadyToBoot.h>

-#include <Protocol/SmmEndOfS3Resume.h>

 #include <Protocol/SmmMemoryAttribute.h>

 

 #include <Guid/Apriori.h>

@@ -41,6 +40,7 @@
 #include <Guid/MemoryProfile.h>

 #include <Guid/LoadModuleAtFixedAddress.h>

 #include <Guid/SmiHandlerProfile.h>

+#include <Guid/EndOfS3Resume.h>

 

 #include <Library/BaseLib.h>

 #include <Library/BaseMemoryLib.h>

diff --git a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
index 01d706d0e3..de0037fe4a 100644
--- a/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
+++ b/MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
@@ -81,7 +81,6 @@
   gEdkiiSmmExitBootServicesProtocolGuid         ## SOMETIMES_PRODUCES

   gEdkiiSmmLegacyBootProtocolGuid               ## SOMETIMES_PRODUCES

   gEdkiiSmmReadyToBootProtocolGuid              ## PRODUCES

-  gEdkiiSmmEndOfS3ResumeProtocolGuid            ## SOMETIMES_PRODUCES

 

   gEfiSmmSwDispatch2ProtocolGuid                ## SOMETIMES_CONSUMES

   gEfiSmmSxDispatch2ProtocolGuid                ## SOMETIMES_CONSUMES

@@ -123,6 +122,7 @@
   ## SOMETIMES_PRODUCES   ## GUID # Install protocol

   ## SOMETIMES_PRODUCES   ## GUID # SmiHandlerRegister

   gSmiHandlerProfileGuid

+  gEdkiiEndOfS3ResumeGuid ## SOMETIMES_PRODUCES ## GUID # Install protocol

 

 [UserExtensions.TianoCore."ExtraFiles"]

   PiSmmCoreExtra.uni