UefiCpuPkg/S3Resume2Pei: prepare MpService2Ppi in S3Resume

Prepare MpService2Ppi in S3Resume when PEI and SMM env run
in the same execution mode. Then smm s3 code can use Mp
Service to wakeup AP instead of only sending InitSipiSipi.

Signed-off-by: Dun Tan <dun.tan@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>

2 files changed, 19 insertions, 2 deletions

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index 9ea5f6f4e5..1fd5670c7f 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -4,7 +4,7 @@
   This module will execute the boot script saved during last boot and after that,

   control is passed to OS waking up handler.

 

-  Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>

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

 

   SPDX-License-Identifier: BSD-2-Clause-Patent

@@ -23,6 +23,7 @@
 #include <Ppi/PostBootScriptTable.h>

 #include <Ppi/EndOfPeiPhase.h>

 #include <Ppi/SmmCommunication.h>

+#include <Ppi/MpServices2.h>

 

 #include <Library/DebugLib.h>

 #include <Library/BaseLib.h>

@@ -988,6 +989,7 @@ S3RestoreConfig2 (
   BOOLEAN                        Build4GPageTableOnly;

   BOOLEAN                        InterruptStatus;

   IA32_CR0                       Cr0;

+  EDKII_PEI_MP_SERVICES2_PPI     *MpService2Ppi;

 

   TempAcpiS3Context                 = 0;

   TempEfiBootScriptExecutorVariable = 0;

@@ -1088,6 +1090,7 @@ S3RestoreConfig2 (
     SmmS3ResumeState->ReturnContext1     = (EFI_PHYSICAL_ADDRESS)(UINTN)AcpiS3Context;

     SmmS3ResumeState->ReturnContext2     = (EFI_PHYSICAL_ADDRESS)(UINTN)EfiBootScriptExecutorVariable;

     SmmS3ResumeState->ReturnStackPointer = (EFI_PHYSICAL_ADDRESS)STACK_ALIGN_DOWN (&Status);

+    SmmS3ResumeState->MpService2Ppi      = 0;

 

     DEBUG ((DEBUG_INFO, "SMM S3 Signature                = %x\n", SmmS3ResumeState->Signature));

     DEBUG ((DEBUG_INFO, "SMM S3 Stack Base               = %x\n", SmmS3ResumeState->SmmS3StackBase));

@@ -1109,6 +1112,19 @@ S3RestoreConfig2 (
     if (((SmmS3ResumeState->Signature == SMM_S3_RESUME_SMM_32) && (sizeof (UINTN) == sizeof (UINT32))) ||

         ((SmmS3ResumeState->Signature == SMM_S3_RESUME_SMM_64) && (sizeof (UINTN) == sizeof (UINT64))))

     {

+      //

+      // Get MP Services2 Ppi to pass it to Smm S3.

+      //

+      Status = PeiServicesLocatePpi (

+                 &gEdkiiPeiMpServices2PpiGuid,

+                 0,

+                 NULL,

+                 (VOID **)&MpService2Ppi

+                 );

+      ASSERT_EFI_ERROR (Status);

+      SmmS3ResumeState->MpService2Ppi = (EFI_PHYSICAL_ADDRESS)(UINTN)MpService2Ppi;

+      DEBUG ((DEBUG_INFO, "SMM S3 MpService2Ppi Point = %lx\n", SmmS3ResumeState->MpService2Ppi));

+

       SwitchStack (

         (SWITCH_STACK_ENTRY_POINT)(UINTN)SmmS3ResumeState->SmmS3ResumeEntryPoint,

         (VOID *)AcpiS3Context,

diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index aae984d138..9c9b6f3db3 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 - 2019, Intel Corporation. All rights reserved.<BR>

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

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

 #

 # SPDX-License-Identifier: BSD-2-Clause-Patent

@@ -86,6 +86,7 @@
   gPeiPostScriptTablePpiGuid                    ## SOMETIMES_PRODUCES

   gEfiEndOfPeiSignalPpiGuid                     ## SOMETIMES_PRODUCES

   gEfiPeiSmmCommunicationPpiGuid                ## SOMETIMES_CONSUMES

+  gEdkiiPeiMpServices2PpiGuid                   ## SOMETIMES_CONSUMES

 

 [FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode         ## CONSUMES