UINTN ProcessorNumber;\r
EFI_AP_PROCEDURE Procedure;\r
UINTN BistData;\r
+ volatile UINT32 *ApStartupSignalBuffer;\r
\r
PeiCpuMpData = ExchangeInfo->PeiCpuMpData;\r
- if (PeiCpuMpData->InitFlag) {\r
- ProcessorNumber = NumApsExecuting;\r
- //\r
- // Sync BSP's Control registers to APs\r
- //\r
- RestoreVolatileRegisters (&PeiCpuMpData->CpuData[0].VolatileRegisters, FALSE);\r
- //\r
- // This is first time AP wakeup, get BIST information from AP stack\r
- //\r
- BistData = *(UINTN *) (PeiCpuMpData->Buffer + ProcessorNumber * PeiCpuMpData->CpuApStackSize - sizeof (UINTN));\r
- PeiCpuMpData->CpuData[ProcessorNumber].Health.Uint32 = (UINT32) BistData;\r
- PeiCpuMpData->CpuData[ProcessorNumber].ApicId = GetInitialApicId ();\r
- if (PeiCpuMpData->CpuData[ProcessorNumber].ApicId >= 0xFF) {\r
+ while (TRUE) {\r
+ if (PeiCpuMpData->InitFlag) {\r
+ ProcessorNumber = NumApsExecuting;\r
+ //\r
+ // Sync BSP's Control registers to APs\r
+ //\r
+ RestoreVolatileRegisters (&PeiCpuMpData->CpuData[0].VolatileRegisters, FALSE);\r
+ //\r
+ // This is first time AP wakeup, get BIST information from AP stack\r
+ //\r
+ BistData = *(UINTN *) (PeiCpuMpData->Buffer + ProcessorNumber * PeiCpuMpData->CpuApStackSize - sizeof (UINTN));\r
+ PeiCpuMpData->CpuData[ProcessorNumber].Health.Uint32 = (UINT32) BistData;\r
+ PeiCpuMpData->CpuData[ProcessorNumber].ApicId = GetInitialApicId ();\r
+ if (PeiCpuMpData->CpuData[ProcessorNumber].ApicId >= 0xFF) {\r
+ //\r
+ // Set x2APIC mode if there are any logical processor reporting\r
+ // an APIC ID of 255 or greater.\r
+ //\r
+ AcquireSpinLock(&PeiCpuMpData->MpLock);\r
+ PeiCpuMpData->X2ApicEnable = TRUE;\r
+ ReleaseSpinLock(&PeiCpuMpData->MpLock);\r
+ }\r
+ //\r
+ // Sync BSP's Mtrr table to all wakeup APs and load microcode on APs.\r
+ //\r
+ MtrrSetAllMtrrs (&PeiCpuMpData->MtrrTable);\r
+ MicrocodeDetect ();\r
+ PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle;\r
+ } else {\r
//\r
- // Set x2APIC mode if there are any logical processor reporting\r
- // an APIC ID of 255 or greater.\r
+ // Execute AP function if AP is not disabled\r
//\r
- AcquireSpinLock(&PeiCpuMpData->MpLock);\r
- PeiCpuMpData->X2ApicEnable = TRUE;\r
- ReleaseSpinLock(&PeiCpuMpData->MpLock);\r
+ GetProcessorNumber (PeiCpuMpData, &ProcessorNumber);\r
+ if (PeiCpuMpData->ApLoopMode == ApInHltLoop) {\r
+ //\r
+ // Restore AP's volatile registers saved\r
+ //\r
+ RestoreVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE);\r
+ }\r
+\r
+ if ((PeiCpuMpData->CpuData[ProcessorNumber].State != CpuStateDisabled) &&\r
+ (PeiCpuMpData->ApFunction != 0)) {\r
+ PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateBusy;\r
+ Procedure = (EFI_AP_PROCEDURE)(UINTN)PeiCpuMpData->ApFunction;\r
+ //\r
+ // Invoke AP function here\r
+ //\r
+ Procedure ((VOID *)(UINTN)PeiCpuMpData->ApFunctionArgument);\r
+ //\r
+ // Re-get the processor number due to BSP/AP maybe exchange in AP function\r
+ //\r
+ GetProcessorNumber (PeiCpuMpData, &ProcessorNumber);\r
+ PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle;\r
+ }\r
}\r
+\r
//\r
- // Sync BSP's Mtrr table to all wakeup APs and load microcode on APs.\r
+ // AP finished executing C code\r
//\r
- MtrrSetAllMtrrs (&PeiCpuMpData->MtrrTable);\r
- MicrocodeDetect ();\r
- PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle;\r
- } else {\r
+ InterlockedIncrement ((UINT32 *)&PeiCpuMpData->FinishedCount);\r
+\r
//\r
- // Execute AP function if AP is not disabled\r
+ // Place AP is specified loop mode\r
//\r
- GetProcessorNumber (PeiCpuMpData, &ProcessorNumber);\r
+ if (PeiCpuMpData->ApLoopMode == ApInHltLoop) {\r
+ //\r
+ // Save AP volatile registers\r
+ //\r
+ SaveVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters);\r
+ //\r
+ // Place AP in Hlt-loop\r
+ //\r
+ while (TRUE) {\r
+ DisableInterrupts ();\r
+ CpuSleep ();\r
+ CpuPause ();\r
+ }\r
+ }\r
+ ApStartupSignalBuffer = PeiCpuMpData->CpuData[ProcessorNumber].StartupApSignal;\r
//\r
- // Restore AP's volatile registers saved\r
+ // Clear AP start-up signal\r
//\r
- RestoreVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE);\r
+ *ApStartupSignalBuffer = 0;\r
+ while (TRUE) {\r
+ DisableInterrupts ();\r
+ if (PeiCpuMpData->ApLoopMode == ApInMwaitLoop) {\r
+ //\r
+ // Place AP in Mwait-loop\r
+ //\r
+ AsmMonitor ((UINTN)ApStartupSignalBuffer, 0, 0);\r
+ if (*ApStartupSignalBuffer != WAKEUP_AP_SIGNAL) {\r
+ //\r
+ // If AP start-up signal is not set, place AP into\r
+ // the maximum C-state\r
+ //\r
+ AsmMwait (PeiCpuMpData->ApTargetCState << 4, 0);\r
+ }\r
+ } else if (PeiCpuMpData->ApLoopMode == ApInRunLoop) {\r
+ //\r
+ // Place AP in Run-loop\r
+ //\r
+ CpuPause ();\r
+ } else {\r
+ ASSERT (FALSE);\r
+ }\r
\r
- if ((PeiCpuMpData->CpuData[ProcessorNumber].State != CpuStateDisabled) &&\r
- (PeiCpuMpData->ApFunction != 0)) {\r
- PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateBusy;\r
- Procedure = (EFI_AP_PROCEDURE)(UINTN)PeiCpuMpData->ApFunction;\r
//\r
- // Invoke AP function here\r
+ // If AP start-up signal is written, AP is waken up\r
+ // otherwise place AP in loop again\r
//\r
- Procedure ((VOID *)(UINTN)PeiCpuMpData->ApFunctionArgument);\r
- PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle;\r
+ if (*ApStartupSignalBuffer == WAKEUP_AP_SIGNAL) {\r
+ break;\r
+ }\r
}\r
}\r
-\r
- //\r
- // AP finished executing C code\r
- //\r
- InterlockedIncrement ((UINT32 *)&PeiCpuMpData->FinishedCount);\r
-\r
- //\r
- // Save AP volatile registers\r
- //\r
- SaveVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters);\r
-\r
- AsmCliHltLoop ();\r
}\r
\r
/**\r
@param PeiCpuMpData Pointer to PEI CPU MP Data\r
@param Broadcast TRUE: Send broadcast IPI to all APs\r
FALSE: Send IPI to AP by ApicId\r
- @param ApicId Apic ID for the processor to be waked\r
+ @param ProcessorNumber The handle number of specified processor\r
@param Procedure The function to be invoked by AP\r
@param ProcedureArgument The argument to be passed into AP function\r
**/\r
WakeUpAP (\r
IN PEI_CPU_MP_DATA *PeiCpuMpData,\r
IN BOOLEAN Broadcast,\r
- IN UINT32 ApicId,\r
+ IN UINTN ProcessorNumber,\r
IN EFI_AP_PROCEDURE Procedure, OPTIONAL\r
IN VOID *ProcedureArgument OPTIONAL\r
)\r
{\r
volatile MP_CPU_EXCHANGE_INFO *ExchangeInfo;\r
+ UINTN Index;\r
\r
PeiCpuMpData->ApFunction = (UINTN) Procedure;\r
PeiCpuMpData->ApFunctionArgument = (UINTN) ProcedureArgument;\r
CopyMem ((VOID *)&ExchangeInfo->GdtrProfile, &mGdt, sizeof(mGdt));\r
AsmReadIdtr ((IA32_DESCRIPTOR *) &ExchangeInfo->IdtrProfile);\r
\r
- if (Broadcast) {\r
- SendInitSipiSipiAllExcludingSelf ((UINT32) ExchangeInfo->BufferStart);\r
- } else {\r
- SendInitSipiSipi (ApicId, (UINT32) ExchangeInfo->BufferStart);\r
+ if (PeiCpuMpData->ApLoopMode == ApInMwaitLoop) {\r
+ //\r
+ // Get AP target C-state each time when waking up AP,\r
+ // for it maybe updated by platform again\r
+ //\r
+ PeiCpuMpData->ApTargetCState = PcdGet8 (PcdCpuApTargetCstate);\r
}\r
\r
+ //\r
+ // Wakeup APs per AP loop state\r
+ //\r
+ if (PeiCpuMpData->ApLoopMode == ApInHltLoop || PeiCpuMpData->InitFlag) {\r
+ if (Broadcast) {\r
+ SendInitSipiSipiAllExcludingSelf ((UINT32) ExchangeInfo->BufferStart);\r
+ } else {\r
+ SendInitSipiSipi (\r
+ PeiCpuMpData->CpuData[ProcessorNumber].ApicId,\r
+ (UINT32) ExchangeInfo->BufferStart\r
+ );\r
+ }\r
+ } else if ((PeiCpuMpData->ApLoopMode == ApInMwaitLoop) ||\r
+ (PeiCpuMpData->ApLoopMode == ApInRunLoop)) {\r
+ if (Broadcast) {\r
+ for (Index = 0; Index < PeiCpuMpData->CpuCount; Index++) {\r
+ if (Index != PeiCpuMpData->BspNumber) {\r
+ *(PeiCpuMpData->CpuData[Index].StartupApSignal) = WAKEUP_AP_SIGNAL;\r
+ }\r
+ }\r
+ } else {\r
+ *(PeiCpuMpData->CpuData[ProcessorNumber].StartupApSignal) = WAKEUP_AP_SIGNAL;\r
+ }\r
+ } else {\r
+ ASSERT (FALSE);\r
+ }\r
return ;\r
}\r
\r
if (PeiCpuMpData->X2ApicEnable) {\r
DEBUG ((EFI_D_INFO, "Force x2APIC mode!\n"));\r
//\r
- // Send 2nd broadcast IPI to all APs to enable x2APIC mode\r
+ // Wakeup all APs to enable x2APIC mode\r
//\r
WakeUpAP (PeiCpuMpData, TRUE, 0, ApFuncEnableX2Apic, NULL);\r
//\r
UINTN WakeupBuffer;\r
UINTN WakeupBufferSize;\r
MP_ASSEMBLY_ADDRESS_MAP AddressMap;\r
+ UINT8 ApLoopMode;\r
+ UINT16 MonitorFilterSize;\r
+ UINT8 *MonitorBuffer;\r
+ UINTN Index;\r
\r
AsmGetAddressMap (&AddressMap);\r
WakeupBufferSize = AddressMap.RendezvousFunnelSize + sizeof (MP_CPU_EXCHANGE_INFO);\r
DEBUG ((EFI_D_INFO, "CpuMpPei: WakeupBuffer = 0x%x\n", WakeupBuffer));\r
\r
//\r
- // Allocate Pages for APs stack, CPU MP Data and backup buffer for wakeup buffer\r
+ // Allocate Pages for APs stack, CPU MP Data, backup buffer for wakeup buffer,\r
+ // and monitor buffer if required.\r
//\r
MaxCpuCount = PcdGet32(PcdCpuMaxLogicalProcessorNumber);\r
BufferSize = PcdGet32 (PcdCpuApStackSize) * MaxCpuCount + sizeof (PEI_CPU_MP_DATA)\r
+ WakeupBufferSize + sizeof (PEI_CPU_DATA) * MaxCpuCount;\r
+ ApLoopMode = GetApLoopMode (&MonitorFilterSize);\r
+ BufferSize += MonitorFilterSize * MaxCpuCount;\r
Status = PeiServicesAllocatePages (\r
EfiBootServicesData,\r
EFI_SIZE_TO_PAGES (BufferSize),\r
InitializeSpinLock(&PeiCpuMpData->MpLock);\r
SaveVolatileRegisters (&PeiCpuMpData->CpuData[0].VolatileRegisters);\r
CopyMem (&PeiCpuMpData->AddressMap, &AddressMap, sizeof (MP_ASSEMBLY_ADDRESS_MAP));\r
-\r
+ //\r
+ // Initialize AP loop mode\r
+ //\r
+ PeiCpuMpData->ApLoopMode = ApLoopMode;\r
+ DEBUG ((EFI_D_INFO, "AP Loop Mode is %d\n", PeiCpuMpData->ApLoopMode));\r
+ MonitorBuffer = (UINT8 *)(PeiCpuMpData->CpuData + MaxCpuCount);\r
+ if (PeiCpuMpData->ApLoopMode != ApInHltLoop) {\r
+ //\r
+ // Set up APs wakeup signal buffer\r
+ //\r
+ for (Index = 0; Index < MaxCpuCount; Index++) {\r
+ PeiCpuMpData->CpuData[Index].StartupApSignal = \r
+ (UINT32 *)(MonitorBuffer + MonitorFilterSize * Index);\r
+ }\r
+ }\r
//\r
// Backup original data and copy AP reset code in it\r
//\r
projects / mirror_edk2.git / blobdiff