Use MpService2Ppi to wakeup AP in s3 boot flow during initializing
CPU. If mSmmS3ResumeState->MpService2Ppi is not 0, then BSP will
use MpService2Ppi->StartupAllCPUs to do CPU initialization for both
BSP and AP instead of only sending InitSipiSipi for AP.
Signed-off-by: Dun Tan <dun....@intel.com>
Cc: Eric Dong <eric.d...@intel.com>
Cc: Ray Ni <ray...@intel.com>
Cc: Rahul Kumar <rahul1.ku...@intel.com>
---
UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 75
+++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 55 insertions(+), 20 deletions(-)
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
index d2e2135d08..8b0e4afc59 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
@@ -7,6 +7,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "PiSmmCpuDxeSmm.h"
+#include <PiPei.h>
+#include <Ppi/MpServices2.h>
#pragma pack(1)
typedef struct {
@@ -571,12 +573,17 @@ InitializeAp (
SetRegister (FALSE);
//
- // Place AP into the safe code, count down the number with lock mechanism in
the safe code.
+ // When using MpService2Ppi to wakeup AP, BSP will fail to return from
MpService2Ppi if AP hang there.
//
- TopOfStack = (UINTN)Stack + sizeof (Stack);
- TopOfStack &= ~(UINTN)(CPU_STACK_ALIGNMENT - 1);
- CopyMem ((VOID *)(UINTN)mApHltLoopCode, mApHltLoopCodeTemplate, sizeof
(mApHltLoopCodeTemplate));
- TransferApToSafeState ((UINTN)mApHltLoopCode, TopOfStack,
(UINTN)&mNumberToFinish);
+ if (mSmmS3ResumeState->MpService2Ppi == 0) {
+ //
+ // Place AP into the safe code, count down the number with lock mechanism
in the safe code.
+ //
+ TopOfStack = (UINTN)Stack + sizeof (Stack);
+ TopOfStack &= ~(UINTN)(CPU_STACK_ALIGNMENT - 1);
+ CopyMem ((VOID *)(UINTN)mApHltLoopCode, mApHltLoopCodeTemplate, sizeof
(mApHltLoopCodeTemplate));
+ TransferApToSafeState ((UINTN)mApHltLoopCode, TopOfStack,
(UINTN)&mNumberToFinish);
+ }
}
/**
@@ -634,7 +641,7 @@ PrepareApStartupVector (
The function is invoked before SMBASE relocation in S3 path to restores CPU
status.
The function is invoked before SMBASE relocation in S3 path. It does first
time microcode load
- and restores MTRRs for both BSP and APs.
+ and restores MTRRs for BSP.
**/
VOID
@@ -689,8 +696,10 @@ InitializeCpuAfterRebase (
//
SetRegister (FALSE);
- while (mNumberToFinish > 0) {
- CpuPause ();
+ if (mSmmS3ResumeState->MpService2Ppi == 0) {
+ while (mNumberToFinish > 0) {
+ CpuPause ();
+ }
}
}
@@ -742,6 +751,24 @@ InitializeBsp (
}
}
+/**
+ Cpu initialization procedure.
+
+ @param[in,out] Buffer The pointer to private data buffer.
+**/
+VOID
+EFIAPI
+InitializeCpuProcedure (
+ IN OUT VOID *Buffer
+ )
+{
+ if (mBspApicId == GetApicId ()) {
+ InitializeBsp ();
+ } else {
+ InitializeAp ();
+ }
+}
+
/**
Restore SMM Configuration in S3 boot path.
@@ -790,11 +817,12 @@ SmmRestoreCpu (
VOID
)
{
- SMM_S3_RESUME_STATE *SmmS3ResumeState;
- IA32_DESCRIPTOR Ia32Idtr;
- IA32_DESCRIPTOR X64Idtr;
- IA32_IDT_GATE_DESCRIPTOR IdtEntryTable[EXCEPTION_VECTOR_NUMBER];
- EFI_STATUS Status;
+ SMM_S3_RESUME_STATE *SmmS3ResumeState;
+ IA32_DESCRIPTOR Ia32Idtr;
+ IA32_DESCRIPTOR X64Idtr;
+ IA32_IDT_GATE_DESCRIPTOR IdtEntryTable[EXCEPTION_VECTOR_NUMBER];
+ EFI_STATUS Status;
+ EDKII_PEI_MP_SERVICES2_PPI *Mp2ServicePpi;
DEBUG ((DEBUG_INFO, "SmmRestoreCpu()\n"));
@@ -858,15 +886,22 @@ SmmRestoreCpu (
//
mInitApsAfterSmmBaseReloc = FALSE;
- PrepareApStartupVector (mAcpiCpuData.StartupVector);
- //
- // Send INIT IPI - SIPI to all APs
- //
- SendInitSipiSipiAllExcludingSelf ((UINT32)mAcpiCpuData.StartupVector);
+ if (mSmmS3ResumeState->MpService2Ppi != 0) {
+ mBspApicId = GetApicId ();
+ Mp2ServicePpi = (EDKII_PEI_MP_SERVICES2_PPI
*)(UINTN)mSmmS3ResumeState->MpService2Ppi;
+ Mp2ServicePpi->StartupAllCPUs (Mp2ServicePpi,
(EFI_AP_PROCEDURE)InitializeCpuProcedure, 0, NULL);
+ } else {
+ PrepareApStartupVector (mAcpiCpuData.StartupVector);
+ //
+ // Send INIT IPI - SIPI to all APs
+ //
+ SendInitSipiSipiAllExcludingSelf ((UINT32)mAcpiCpuData.StartupVector);
+ InitializeBsp ();
+ }
+ } else {
+ InitializeBsp ();
}
- InitializeBsp ();
-
//
// Set a flag to restore SMM configuration in S3 path.
//
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#107283): https://edk2.groups.io/g/devel/message/107283
Mute This Topic: https://groups.io/mt/100383964/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
