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>

2 files changed, 6 insertions, 9 deletions

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index e0c2d366cd..b597ac7dc5 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -23,6 +23,7 @@
 #include <Guid/AcpiS3Context.h>

 #include <Guid/BootScriptExecutorVariable.h>

 #include <Guid/Performance.h>

+#include <Guid/EndOfS3Resume.h>

 #include <Ppi/ReadOnlyVariable2.h>

 #include <Ppi/S3Resume2.h>

 #include <Ppi/SmmAccess.h>

@@ -30,8 +31,6 @@
 #include <Ppi/EndOfPeiPhase.h>

 #include <Ppi/SmmCommunication.h>

 

-#include <Protocol/SmmEndOfS3Resume.h>

-

 #include <Library/DebugLib.h>

 #include <Library/BaseLib.h>

 #include <Library/TimerLib.h>

@@ -156,7 +155,7 @@ typedef union {
 

 //

 // Define two type of smm communicate headers.

-// One for 32 bits  PEI + 64 bits DXE, the other for 32 bits PEI + 32 bits DXE case.

+// One for 32 bits PEI + 64 bits DXE, the other for 32 bits PEI + 32 bits DXE case.

 //

 typedef struct {

   EFI_GUID  HeaderGuid;

@@ -471,7 +470,7 @@ SignalEndOfS3Resume (
   // This buffer consumed in DXE phase, so base on DXE mode to prepare communicate buffer.

   // Detect whether DXE is 64 bits mode.

   // if (sizeof(UINTN) == sizeof(UINT64), PEI already 64 bits, assume DXE also 64 bits.

-  // or (FeaturePcdGet (PcdDxeIplSwitchToLongMode)), Dxe will switch to 64 bits.

+  // or (FeaturePcdGet (PcdDxeIplSwitchToLongMode)), DXE will switch to 64 bits.

   //

   if ((sizeof(UINTN) == sizeof(UINT64)) || (FeaturePcdGet (PcdDxeIplSwitchToLongMode))) {

     CommBuffer = &Header64;

@@ -482,7 +481,7 @@ SignalEndOfS3Resume (
     Header32.MessageLength = 0;

     CommSize = OFFSET_OF (SMM_COMMUNICATE_HEADER_32, Data);

   }

-  CopyGuid (CommBuffer, &gEdkiiSmmEndOfS3ResumeProtocolGuid);

+  CopyGuid (CommBuffer, &gEdkiiEndOfS3ResumeGuid);

 

   Status = PeiServicesLocatePpi (

              &gEfiPeiSmmCommunicationPpiGuid,

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index 943f114e69..15fa2d1543 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -5,7 +5,7 @@
 # This module will excute the boot script saved during last boot and after that,

 # control is passed to OS waking up handler.

 #

-# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.<BR>

 # Copyright (c) 2017, AMD Incorporated. All rights reserved.<BR>

 #

 # This program and the accompanying materials are

@@ -78,6 +78,7 @@
   ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox

   gEfiAcpiVariableGuid

   gEfiAcpiS3ContextGuid                         ## SOMETIMES_CONSUMES ## UNDEFINED # LockBox

+  gEdkiiEndOfS3ResumeGuid                       ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication

 

 [Ppis]

   gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES

@@ -87,9 +88,6 @@
   gEfiEndOfPeiSignalPpiGuid                     ## SOMETIMES_PRODUCES

   gEfiPeiSmmCommunicationPpiGuid                ## SOMETIMES_CONSUMES

 

-[Protocols]

-  gEdkiiSmmEndOfS3ResumeProtocolGuid            ## SOMETIMES_CONSUMES

-

 [FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode         ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport  ## CONSUMES