From c87e41b4452f0b5f8f14505b2ca5238f2598ea23 Mon Sep 17 00:00:00 2001 From: Jeff Fan Date: Fri, 18 Dec 2015 03:25:32 +0000 Subject: UefiCpuPkg/CpuMpPei: Place APs in proper loop mode after AP execution After AP function is executed, we will place AP in proper loop mode. Because AP maybe waken up by SMI or other reasons. We need to read signature in monitor buffer to check if APs is waken up by BSP. If it is not waken up by BSP, we will continue to place them into proper loop mode. Contributed-under: TianoCore Contribution Agreement 1.0 Cc: Feng Tian Cc: Michael Kinney Cc: Jordan Justen Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan Tested-by: Michael Kinney Reviewed-by: Michael Kinney git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19345 6f19259b-4bc3-4df7-8a09-765794883524 --- UefiCpuPkg/CpuMpPei/CpuMpPei.c | 148 +++++++++++++++++++++++++++------------ UefiCpuPkg/CpuMpPei/CpuMpPei.h | 3 + UefiCpuPkg/CpuMpPei/CpuMpPei.inf | 1 + 3 files changed, 106 insertions(+), 46 deletions(-) diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c index b8fa5118b4..ba82ba4218 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c @@ -273,68 +273,124 @@ ApCFunction ( UINTN ProcessorNumber; EFI_AP_PROCEDURE Procedure; UINTN BistData; + volatile UINT32 *ApStartupSignalBuffer; PeiCpuMpData = ExchangeInfo->PeiCpuMpData; - if (PeiCpuMpData->InitFlag) { - ProcessorNumber = NumApsExecuting; - // - // Sync BSP's Control registers to APs - // - RestoreVolatileRegisters (&PeiCpuMpData->CpuData[0].VolatileRegisters, FALSE); - // - // This is first time AP wakeup, get BIST information from AP stack - // - BistData = *(UINTN *) (PeiCpuMpData->Buffer + ProcessorNumber * PeiCpuMpData->CpuApStackSize - sizeof (UINTN)); - PeiCpuMpData->CpuData[ProcessorNumber].Health.Uint32 = (UINT32) BistData; - PeiCpuMpData->CpuData[ProcessorNumber].ApicId = GetInitialApicId (); - if (PeiCpuMpData->CpuData[ProcessorNumber].ApicId >= 0xFF) { + while (TRUE) { + if (PeiCpuMpData->InitFlag) { + ProcessorNumber = NumApsExecuting; + // + // Sync BSP's Control registers to APs + // + RestoreVolatileRegisters (&PeiCpuMpData->CpuData[0].VolatileRegisters, FALSE); + // + // This is first time AP wakeup, get BIST information from AP stack + // + BistData = *(UINTN *) (PeiCpuMpData->Buffer + ProcessorNumber * PeiCpuMpData->CpuApStackSize - sizeof (UINTN)); + PeiCpuMpData->CpuData[ProcessorNumber].Health.Uint32 = (UINT32) BistData; + PeiCpuMpData->CpuData[ProcessorNumber].ApicId = GetInitialApicId (); + if (PeiCpuMpData->CpuData[ProcessorNumber].ApicId >= 0xFF) { + // + // Set x2APIC mode if there are any logical processor reporting + // an APIC ID of 255 or greater. + // + AcquireSpinLock(&PeiCpuMpData->MpLock); + PeiCpuMpData->X2ApicEnable = TRUE; + ReleaseSpinLock(&PeiCpuMpData->MpLock); + } + // + // Sync BSP's Mtrr table to all wakeup APs and load microcode on APs. + // + MtrrSetAllMtrrs (&PeiCpuMpData->MtrrTable); + MicrocodeDetect (); + PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle; + } else { // - // Set x2APIC mode if there are any logical processor reporting - // an APIC ID of 255 or greater. + // Execute AP function if AP is not disabled // - AcquireSpinLock(&PeiCpuMpData->MpLock); - PeiCpuMpData->X2ApicEnable = TRUE; - ReleaseSpinLock(&PeiCpuMpData->MpLock); + GetProcessorNumber (PeiCpuMpData, &ProcessorNumber); + if (PeiCpuMpData->ApLoopMode == ApInHltLoop) { + // + // Restore AP's volatile registers saved + // + RestoreVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE); + } + + if ((PeiCpuMpData->CpuData[ProcessorNumber].State != CpuStateDisabled) && + (PeiCpuMpData->ApFunction != 0)) { + PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateBusy; + Procedure = (EFI_AP_PROCEDURE)(UINTN)PeiCpuMpData->ApFunction; + // + // Invoke AP function here + // + Procedure ((VOID *)(UINTN)PeiCpuMpData->ApFunctionArgument); + // + // Re-get the processor number due to BSP/AP maybe exchange in AP function + // + GetProcessorNumber (PeiCpuMpData, &ProcessorNumber); + PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle; + } } + // - // Sync BSP's Mtrr table to all wakeup APs and load microcode on APs. + // AP finished executing C code // - MtrrSetAllMtrrs (&PeiCpuMpData->MtrrTable); - MicrocodeDetect (); - PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle; - } else { + InterlockedIncrement ((UINT32 *)&PeiCpuMpData->FinishedCount); + // - // Execute AP function if AP is not disabled + // Place AP is specified loop mode // - GetProcessorNumber (PeiCpuMpData, &ProcessorNumber); + if (PeiCpuMpData->ApLoopMode == ApInHltLoop) { + // + // Save AP volatile registers + // + SaveVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters); + // + // Place AP in Hlt-loop + // + while (TRUE) { + DisableInterrupts (); + CpuSleep (); + CpuPause (); + } + } + ApStartupSignalBuffer = PeiCpuMpData->CpuData[ProcessorNumber].StartupApSignal; // - // Restore AP's volatile registers saved + // Clear AP start-up signal // - RestoreVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE); + *ApStartupSignalBuffer = 0; + while (TRUE) { + DisableInterrupts (); + if (PeiCpuMpData->ApLoopMode == ApInMwaitLoop) { + // + // Place AP in Mwait-loop + // + AsmMonitor ((UINTN)ApStartupSignalBuffer, 0, 0); + if (*ApStartupSignalBuffer != WAKEUP_AP_SIGNAL) { + // + // If AP start-up signal is not set, place AP into + // the maximum C-state + // + AsmMwait (PeiCpuMpData->ApTargetCState << 4, 0); + } + } else if (PeiCpuMpData->ApLoopMode == ApInRunLoop) { + // + // Place AP in Run-loop + // + CpuPause (); + } else { + ASSERT (FALSE); + } - if ((PeiCpuMpData->CpuData[ProcessorNumber].State != CpuStateDisabled) && - (PeiCpuMpData->ApFunction != 0)) { - PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateBusy; - Procedure = (EFI_AP_PROCEDURE)(UINTN)PeiCpuMpData->ApFunction; // - // Invoke AP function here + // If AP start-up signal is written, AP is waken up + // otherwise place AP in loop again // - Procedure ((VOID *)(UINTN)PeiCpuMpData->ApFunctionArgument); - PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle; + if (*ApStartupSignalBuffer == WAKEUP_AP_SIGNAL) { + break; + } } } - - // - // AP finished executing C code - // - InterlockedIncrement ((UINT32 *)&PeiCpuMpData->FinishedCount); - - // - // Save AP volatile registers - // - SaveVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters); - - AsmCliHltLoop (); } /** diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/UefiCpuPkg/CpuMpPei/CpuMpPei.h index a22bae7005..47038c2825 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.h @@ -38,6 +38,7 @@ #include #include #include +#include #include "Microcode.h" @@ -50,6 +51,8 @@ typedef enum { CpuStateDisabled } CPU_STATE; +#define WAKEUP_AP_SIGNAL SIGNATURE_32 ('S', 'T', 'A', 'P') + typedef enum { ApInHltLoop = 1, ApInMwaitLoop = 2, diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf b/UefiCpuPkg/CpuMpPei/CpuMpPei.inf index 4a5cfe75ff..ec353aed7d 100644 --- a/UefiCpuPkg/CpuMpPei/CpuMpPei.inf +++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.inf @@ -66,6 +66,7 @@ SynchronizationLib TimerLib UefiCpuLib + CpuLib [Ppis] gEfiPeiMpServicesPpiGuid ## PRODUCES -- cgit v1.2.3