#include "CpuMpPei.h"\r
\r
//\r
-// Global Descriptor Table (GDT)\r
+// CPU MP PPI to be installed\r
//\r
-GLOBAL_REMOVE_IF_UNREFERENCED IA32_GDT mGdtEntries[] = {\r
-/* selector { Global Segment Descriptor } */\r
-/* 0x00 */ {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, //null descriptor\r
-/* 0x08 */ {{0xffff, 0, 0, 0x2, 1, 0, 1, 0xf, 0, 0, 1, 1, 0}}, //linear data segment descriptor\r
-/* 0x10 */ {{0xffff, 0, 0, 0xf, 1, 0, 1, 0xf, 0, 0, 1, 1, 0}}, //linear code segment descriptor\r
-/* 0x18 */ {{0xffff, 0, 0, 0x3, 1, 0, 1, 0xf, 0, 0, 1, 1, 0}}, //system data segment descriptor\r
-/* 0x20 */ {{0xffff, 0, 0, 0xa, 1, 0, 1, 0xf, 0, 0, 1, 1, 0}}, //system code segment descriptor\r
-/* 0x28 */ {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, //spare segment descriptor\r
-/* 0x30 */ {{0xffff, 0, 0, 0x2, 1, 0, 1, 0xf, 0, 0, 1, 1, 0}}, //system data segment descriptor\r
-/* 0x38 */ {{0xffff, 0, 0, 0xa, 1, 0, 1, 0xf, 0, 1, 0, 1, 0}}, //system code segment descriptor\r
-/* 0x40 */ {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, //spare segment descriptor\r
+EFI_PEI_MP_SERVICES_PPI mMpServicesPpi = {\r
+ PeiGetNumberOfProcessors,\r
+ PeiGetProcessorInfo,\r
+ PeiStartupAllAPs,\r
+ PeiStartupThisAP,\r
+ PeiSwitchBSP,\r
+ PeiEnableDisableAP,\r
+ PeiWhoAmI,\r
};\r
\r
-//\r
-// IA32 Gdt register\r
-//\r
-GLOBAL_REMOVE_IF_UNREFERENCED IA32_DESCRIPTOR mGdt = {\r
- sizeof (mGdtEntries) - 1,\r
- (UINTN) mGdtEntries\r
- };\r
-\r
-GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_NOTIFY_DESCRIPTOR mNotifyList = {\r
- (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
- &gEfiEndOfPeiSignalPpiGuid,\r
- CpuMpEndOfPeiCallback\r
+EFI_PEI_PPI_DESCRIPTOR mPeiCpuMpPpiDesc = {\r
+ (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),\r
+ &gEfiPeiMpServicesPpiGuid,\r
+ &mMpServicesPpi\r
};\r
\r
/**\r
- Sort the APIC ID of all processors.\r
-\r
- This function sorts the APIC ID of all processors so that processor number is\r
- assigned in the ascending order of APIC ID which eases MP debugging.\r
-\r
- @param PeiCpuMpData Pointer to PEI CPU MP Data\r
+ This service retrieves the number of logical processor in the platform\r
+ and the number of those logical processors that are enabled on this boot.\r
+ This service may only be called from the BSP.\r
+\r
+ This function is used to retrieve the following information:\r
+ - The number of logical processors that are present in the system.\r
+ - The number of enabled logical processors in the system at the instant\r
+ this call is made.\r
+\r
+ Because MP Service Ppi provides services to enable and disable processors\r
+ dynamically, the number of enabled logical processors may vary during the\r
+ course of a boot session.\r
+\r
+ If this service is called from an AP, then EFI_DEVICE_ERROR is returned.\r
+ If NumberOfProcessors or NumberOfEnabledProcessors is NULL, then\r
+ EFI_INVALID_PARAMETER is returned. Otherwise, the total number of processors\r
+ is returned in NumberOfProcessors, the number of currently enabled processor\r
+ is returned in NumberOfEnabledProcessors, and EFI_SUCCESS is returned.\r
+\r
+ @param[in] PeiServices An indirect pointer to the PEI Services Table\r
+ published by the PEI Foundation.\r
+ @param[in] This Pointer to this instance of the PPI.\r
+ @param[out] NumberOfProcessors Pointer to the total number of logical processors in\r
+ the system, including the BSP and disabled APs.\r
+ @param[out] NumberOfEnabledProcessors\r
+ Number of processors in the system that are enabled.\r
+\r
+ @retval EFI_SUCCESS The number of logical processors and enabled\r
+ logical processors was retrieved.\r
+ @retval EFI_DEVICE_ERROR The calling processor is an AP.\r
+ @retval EFI_INVALID_PARAMETER NumberOfProcessors is NULL.\r
+ NumberOfEnabledProcessors is NULL.\r
**/\r
-VOID\r
-SortApicId (\r
- IN PEI_CPU_MP_DATA *PeiCpuMpData\r
- )\r
-{\r
- UINTN Index1;\r
- UINTN Index2;\r
- UINTN Index3;\r
- UINT32 ApicId;\r
- PEI_CPU_DATA CpuData;\r
- UINT32 ApCount;\r
-\r
- ApCount = PeiCpuMpData->CpuCount - 1;\r
-\r
- if (ApCount != 0) {\r
- for (Index1 = 0; Index1 < ApCount; Index1++) {\r
- Index3 = Index1;\r
- //\r
- // Sort key is the hardware default APIC ID\r
- //\r
- ApicId = PeiCpuMpData->CpuData[Index1].ApicId;\r
- for (Index2 = Index1 + 1; Index2 <= ApCount; Index2++) {\r
- if (ApicId > PeiCpuMpData->CpuData[Index2].ApicId) {\r
- Index3 = Index2;\r
- ApicId = PeiCpuMpData->CpuData[Index2].ApicId;\r
- }\r
- }\r
- if (Index3 != Index1) {\r
- CopyMem (&CpuData, &PeiCpuMpData->CpuData[Index3], sizeof (PEI_CPU_DATA));\r
- CopyMem (\r
- &PeiCpuMpData->CpuData[Index3],\r
- &PeiCpuMpData->CpuData[Index1],\r
- sizeof (PEI_CPU_DATA)\r
- );\r
- CopyMem (&PeiCpuMpData->CpuData[Index1], &CpuData, sizeof (PEI_CPU_DATA));\r
- }\r
- }\r
-\r
- //\r
- // Get the processor number for the BSP\r
- //\r
- ApicId = GetInitialApicId ();\r
- for (Index1 = 0; Index1 < PeiCpuMpData->CpuCount; Index1++) {\r
- if (PeiCpuMpData->CpuData[Index1].ApicId == ApicId) {\r
- PeiCpuMpData->BspNumber = (UINT32) Index1;\r
- break;\r
- }\r
- }\r
- }\r
-}\r
-\r
-/**\r
- Enable x2APIC mode on APs.\r
-\r
- @param Buffer Pointer to private data buffer.\r
-**/\r
-VOID\r
+EFI_STATUS\r
EFIAPI\r
-ApFuncEnableX2Apic (\r
- IN OUT VOID *Buffer\r
- )\r
-{\r
- SetApicMode (LOCAL_APIC_MODE_X2APIC);\r
-}\r
-\r
-/**\r
- Get AP loop mode.\r
-\r
- @param MonitorFilterSize Returns the largest monitor-line size in bytes.\r
-\r
- @return The AP loop mode.\r
-**/\r
-UINT8\r
-GetApLoopMode (\r
- OUT UINT16 *MonitorFilterSize\r
- )\r
-{\r
- UINT8 ApLoopMode;\r
- UINT32 RegEbx;\r
- UINT32 RegEcx;\r
- UINT32 RegEdx;\r
-\r
- ASSERT (MonitorFilterSize != NULL);\r
-\r
- ApLoopMode = PcdGet8 (PcdCpuApLoopMode);\r
- ASSERT (ApLoopMode >= ApInHltLoop && ApLoopMode <= ApInRunLoop);\r
- if (ApLoopMode == ApInMwaitLoop) {\r
- AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, &RegEcx, NULL);\r
- if ((RegEcx & BIT3) == 0) {\r
- //\r
- // If processor does not support MONITOR/MWAIT feature\r
- // by CPUID.[EAX=01H]:ECX.BIT3, force AP in Hlt-loop mode\r
- //\r
- ApLoopMode = ApInHltLoop;\r
- }\r
- }\r
-\r
- if (ApLoopMode == ApInHltLoop) {\r
- *MonitorFilterSize = 0;\r
- } else if (ApLoopMode == ApInRunLoop) {\r
- *MonitorFilterSize = sizeof (UINT32);\r
- } else if (ApLoopMode == ApInMwaitLoop) {\r
- //\r
- // CPUID.[EAX=05H]:EBX.BIT0-15: Largest monitor-line size in bytes\r
- // CPUID.[EAX=05H].EDX: C-states supported using MWAIT\r
- //\r
- AsmCpuid (CPUID_MONITOR_MWAIT, NULL, &RegEbx, NULL, &RegEdx);\r
- *MonitorFilterSize = RegEbx & 0xFFFF;\r
- }\r
-\r
- return ApLoopMode;\r
-}\r
-\r
-/**\r
- Get CPU MP Data pointer from the Guided HOB.\r
-\r
- @return Pointer to Pointer to PEI CPU MP Data\r
-**/\r
-PEI_CPU_MP_DATA *\r
-GetMpHobData (\r
- VOID\r
- )\r
-{\r
- EFI_HOB_GUID_TYPE *GuidHob;\r
- VOID *DataInHob;\r
- PEI_CPU_MP_DATA *CpuMpData;\r
-\r
- CpuMpData = NULL;\r
- GuidHob = GetFirstGuidHob (&gEfiCallerIdGuid);\r
- if (GuidHob != NULL) {\r
- DataInHob = GET_GUID_HOB_DATA (GuidHob);\r
- CpuMpData = (PEI_CPU_MP_DATA *)(*(UINTN *)DataInHob);\r
- }\r
- ASSERT (CpuMpData != NULL);\r
- return CpuMpData;\r
-}\r
-\r
-/**\r
- Save the volatile registers required to be restored following INIT IPI.\r
- \r
- @param VolatileRegisters Returns buffer saved the volatile resisters\r
-**/\r
-VOID\r
-SaveVolatileRegisters (\r
- OUT CPU_VOLATILE_REGISTERS *VolatileRegisters\r
+PeiGetNumberOfProcessors (\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_MP_SERVICES_PPI *This,\r
+ OUT UINTN *NumberOfProcessors,\r
+ OUT UINTN *NumberOfEnabledProcessors\r
)\r
{\r
- UINT32 RegEdx;\r
-\r
- VolatileRegisters->Cr0 = AsmReadCr0 ();\r
- VolatileRegisters->Cr3 = AsmReadCr3 ();\r
- VolatileRegisters->Cr4 = AsmReadCr4 ();\r
-\r
- AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &RegEdx);\r
- if ((RegEdx & BIT2) != 0) {\r
- //\r
- // If processor supports Debugging Extensions feature\r
- // by CPUID.[EAX=01H]:EDX.BIT2\r
- //\r
- VolatileRegisters->Dr0 = AsmReadDr0 ();\r
- VolatileRegisters->Dr1 = AsmReadDr1 ();\r
- VolatileRegisters->Dr2 = AsmReadDr2 ();\r
- VolatileRegisters->Dr3 = AsmReadDr3 ();\r
- VolatileRegisters->Dr6 = AsmReadDr6 ();\r
- VolatileRegisters->Dr7 = AsmReadDr7 ();\r
+ if ((NumberOfProcessors == NULL) || (NumberOfEnabledProcessors == NULL)) {\r
+ return EFI_INVALID_PARAMETER;\r
}\r
-}\r
\r
-/**\r
- Restore the volatile registers following INIT IPI.\r
- \r
- @param VolatileRegisters Pointer to volatile resisters\r
- @param IsRestoreDr TRUE: Restore DRx if supported\r
- FALSE: Do not restore DRx\r
-**/\r
-VOID\r
-RestoreVolatileRegisters (\r
- IN CPU_VOLATILE_REGISTERS *VolatileRegisters,\r
- IN BOOLEAN IsRestoreDr\r
- )\r
-{\r
- UINT32 RegEdx;\r
-\r
- AsmWriteCr0 (VolatileRegisters->Cr0);\r
- AsmWriteCr3 (VolatileRegisters->Cr3);\r
- AsmWriteCr4 (VolatileRegisters->Cr4);\r
-\r
- if (IsRestoreDr) {\r
- AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &RegEdx);\r
- if ((RegEdx & BIT2) != 0) {\r
- //\r
- // If processor supports Debugging Extensions feature\r
- // by CPUID.[EAX=01H]:EDX.BIT2\r
- //\r
- AsmWriteDr0 (VolatileRegisters->Dr0);\r
- AsmWriteDr1 (VolatileRegisters->Dr1);\r
- AsmWriteDr2 (VolatileRegisters->Dr2);\r
- AsmWriteDr3 (VolatileRegisters->Dr3);\r
- AsmWriteDr6 (VolatileRegisters->Dr6);\r
- AsmWriteDr7 (VolatileRegisters->Dr7);\r
- }\r
- }\r
+ return MpInitLibGetNumberOfProcessors (\r
+ NumberOfProcessors,\r
+ NumberOfEnabledProcessors\r
+ );\r
}\r
\r
/**\r
- This function will be called from AP reset code if BSP uses WakeUpAP.\r
-\r
- @param ExchangeInfo Pointer to the MP exchange info buffer\r
- @param NumApsExecuting Number of current executing AP\r
+ Gets detailed MP-related information on the requested processor at the\r
+ instant this call is made. This service may only be called from the BSP.\r
+\r
+ This service retrieves detailed MP-related information about any processor\r
+ on the platform. Note the following:\r
+ - The processor information may change during the course of a boot session.\r
+ - The information presented here is entirely MP related.\r
+\r
+ Information regarding the number of caches and their sizes, frequency of operation,\r
+ slot numbers is all considered platform-related information and is not provided\r
+ by this service.\r
+\r
+ @param[in] PeiServices An indirect pointer to the PEI Services Table\r
+ published by the PEI Foundation.\r
+ @param[in] This Pointer to this instance of the PPI.\r
+ @param[in] ProcessorNumber Pointer to the total number of logical processors in\r
+ the system, including the BSP and disabled APs.\r
+ @param[out] ProcessorInfoBuffer Number of processors in the system that are enabled.\r
+\r
+ @retval EFI_SUCCESS Processor information was returned.\r
+ @retval EFI_DEVICE_ERROR The calling processor is an AP.\r
+ @retval EFI_INVALID_PARAMETER ProcessorInfoBuffer is NULL.\r
+ @retval EFI_NOT_FOUND The processor with the handle specified by\r
+ ProcessorNumber does not exist in the platform.\r
**/\r
-VOID\r
+EFI_STATUS\r
EFIAPI\r
-ApCFunction (\r
- IN MP_CPU_EXCHANGE_INFO *ExchangeInfo,\r
- IN UINTN NumApsExecuting\r
+PeiGetProcessorInfo (\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_MP_SERVICES_PPI *This,\r
+ IN UINTN ProcessorNumber,\r
+ OUT EFI_PROCESSOR_INFORMATION *ProcessorInfoBuffer\r
)\r
{\r
- PEI_CPU_MP_DATA *PeiCpuMpData;\r
- UINTN ProcessorNumber;\r
- EFI_AP_PROCEDURE Procedure;\r
- UINTN BistData;\r
- volatile UINT32 *ApStartupSignalBuffer;\r
-\r
- PeiCpuMpData = ExchangeInfo->PeiCpuMpData;\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 (PeiCpuMpData);\r
- PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateIdle;\r
- } else {\r
- //\r
- // Execute AP function if AP is not disabled\r
- //\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
- // AP finished executing C code\r
- //\r
- InterlockedIncrement ((UINT32 *)&PeiCpuMpData->FinishedCount);\r
-\r
- //\r
- // Place AP is specified loop mode\r
- //\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
- 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
- //\r
- // If AP start-up signal is written, AP is waken up\r
- // otherwise place AP in loop again\r
- //\r
- if (*ApStartupSignalBuffer == WAKEUP_AP_SIGNAL) {\r
- //\r
- // Clear AP start-up signal when AP waken up\r
- //\r
- InterlockedCompareExchange32 (\r
- (UINT32 *)ApStartupSignalBuffer,\r
- WAKEUP_AP_SIGNAL,\r
- 0\r
- );\r
- break;\r
- }\r
- }\r
- }\r
+ return MpInitLibGetProcessorInfo (ProcessorNumber, ProcessorInfoBuffer, NULL);\r
}\r
\r
/**\r
- Write AP start-up signal to wakeup AP.\r
-\r
- @param ApStartupSignalBuffer Pointer to AP wakeup signal\r
+ This service executes a caller provided function on all enabled APs. APs can\r
+ run either simultaneously or one at a time in sequence. This service supports\r
+ both blocking requests only. This service may only\r
+ be called from the BSP.\r
+\r
+ This function is used to dispatch all the enabled APs to the function specified\r
+ by Procedure. If any enabled AP is busy, then EFI_NOT_READY is returned\r
+ immediately and Procedure is not started on any AP.\r
+\r
+ If SingleThread is TRUE, all the enabled APs execute the function specified by\r
+ Procedure one by one, in ascending order of processor handle number. Otherwise,\r
+ all the enabled APs execute the function specified by Procedure simultaneously.\r
+\r
+ If the timeout specified by TimeoutInMicroSeconds expires before all APs return\r
+ from Procedure, then Procedure on the failed APs is terminated. All enabled APs\r
+ are always available for further calls to EFI_PEI_MP_SERVICES_PPI.StartupAllAPs()\r
+ and EFI_PEI_MP_SERVICES_PPI.StartupThisAP(). If FailedCpuList is not NULL, its\r
+ content points to the list of processor handle numbers in which Procedure was\r
+ terminated.\r
+\r
+ Note: It is the responsibility of the consumer of the EFI_PEI_MP_SERVICES_PPI.StartupAllAPs()\r
+ to make sure that the nature of the code that is executed on the BSP and the\r
+ dispatched APs is well controlled. The MP Services Ppi does not guarantee\r
+ that the Procedure function is MP-safe. Hence, the tasks that can be run in\r
+ parallel are limited to certain independent tasks and well-controlled exclusive\r
+ code. PEI services and Ppis may not be called by APs unless otherwise\r
+ specified.\r
+\r
+ In blocking execution mode, BSP waits until all APs finish or\r
+ TimeoutInMicroSeconds expires.\r
+\r
+ @param[in] PeiServices An indirect pointer to the PEI Services Table\r
+ published by the PEI Foundation.\r
+ @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance.\r
+ @param[in] Procedure A pointer to the function to be run on enabled APs of\r
+ the system.\r
+ @param[in] SingleThread If TRUE, then all the enabled APs execute the function\r
+ specified by Procedure one by one, in ascending order\r
+ of processor handle number. If FALSE, then all the\r
+ enabled APs execute the function specified by Procedure\r
+ simultaneously.\r
+ @param[in] TimeoutInMicroSeconds\r
+ Indicates the time limit in microseconds for APs to\r
+ return from Procedure, for blocking mode only. Zero\r
+ means infinity. If the timeout expires before all APs\r
+ return from Procedure, then Procedure on the failed APs\r
+ is terminated. All enabled APs are available for next\r
+ function assigned by EFI_PEI_MP_SERVICES_PPI.StartupAllAPs()\r
+ or EFI_PEI_MP_SERVICES_PPI.StartupThisAP(). If the\r
+ timeout expires in blocking mode, BSP returns\r
+ EFI_TIMEOUT.\r
+ @param[in] ProcedureArgument The parameter passed into Procedure for all APs.\r
+\r
+ @retval EFI_SUCCESS In blocking mode, all APs have finished before the\r
+ timeout expired.\r
+ @retval EFI_DEVICE_ERROR Caller processor is AP.\r
+ @retval EFI_NOT_STARTED No enabled APs exist in the system.\r
+ @retval EFI_NOT_READY Any enabled APs are busy.\r
+ @retval EFI_TIMEOUT In blocking mode, the timeout expired before all\r
+ enabled APs have finished.\r
+ @retval EFI_INVALID_PARAMETER Procedure is NULL.\r
**/\r
-VOID\r
-WriteStartupSignal (\r
- IN volatile UINT32 *ApStartupSignalBuffer\r
- )\r
-{\r
- *ApStartupSignalBuffer = WAKEUP_AP_SIGNAL;\r
- //\r
- // If AP is waken up, StartupApSignal should be cleared.\r
- // Otherwise, write StartupApSignal again till AP waken up.\r
- //\r
- while (InterlockedCompareExchange32 (\r
- (UINT32 *)ApStartupSignalBuffer,\r
- WAKEUP_AP_SIGNAL,\r
- WAKEUP_AP_SIGNAL\r
- ) != 0) {\r
- CpuPause ();\r
- }\r
-}\r
-\r
-/**\r
- This function will be called by BSP to wakeup AP.\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 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
-VOID\r
-WakeUpAP (\r
- IN PEI_CPU_MP_DATA *PeiCpuMpData,\r
- IN BOOLEAN Broadcast,\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
- PeiCpuMpData->FinishedCount = 0;\r
-\r
- ExchangeInfo = PeiCpuMpData->MpCpuExchangeInfo;\r
- ExchangeInfo->Lock = 0;\r
- ExchangeInfo->StackStart = PeiCpuMpData->Buffer;\r
- ExchangeInfo->StackSize = PeiCpuMpData->CpuApStackSize;\r
- ExchangeInfo->BufferStart = PeiCpuMpData->WakeupBuffer;\r
- ExchangeInfo->PmodeOffset = PeiCpuMpData->AddressMap.PModeEntryOffset;\r
- ExchangeInfo->LmodeOffset = PeiCpuMpData->AddressMap.LModeEntryOffset;\r
- ExchangeInfo->Cr3 = AsmReadCr3 ();\r
- ExchangeInfo->CodeSegment = AsmReadCs ();\r
- ExchangeInfo->DataSegment = AsmReadDs ();\r
- ExchangeInfo->CFunction = (UINTN) ApCFunction;\r
- ExchangeInfo->NumApsExecuting = 0;\r
- ExchangeInfo->PeiCpuMpData = PeiCpuMpData;\r
-\r
- //\r
- // Get the BSP's data of GDT and IDT\r
- //\r
- CopyMem ((VOID *)&ExchangeInfo->GdtrProfile, &mGdt, sizeof(mGdt));\r
- AsmReadIdtr ((IA32_DESCRIPTOR *) &ExchangeInfo->IdtrProfile);\r
-\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
- WriteStartupSignal (PeiCpuMpData->CpuData[Index].StartupApSignal);\r
- }\r
- }\r
- } else {\r
- WriteStartupSignal (PeiCpuMpData->CpuData[ProcessorNumber].StartupApSignal);\r
- }\r
- } else {\r
- ASSERT (FALSE);\r
- }\r
- return ;\r
-}\r
-\r
-/**\r
- Get available system memory below 1MB by specified size.\r
-\r
- @param WakeupBufferSize Wakeup buffer size required\r
-\r
- @retval other Return wakeup buffer address below 1MB.\r
- @retval -1 Cannot find free memory below 1MB.\r
-**/\r
-UINTN\r
-GetWakeupBuffer (\r
- IN UINTN WakeupBufferSize\r
+EFI_STATUS\r
+EFIAPI\r
+PeiStartupAllAPs (\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_MP_SERVICES_PPI *This,\r
+ IN EFI_AP_PROCEDURE Procedure,\r
+ IN BOOLEAN SingleThread,\r
+ IN UINTN TimeoutInMicroSeconds,\r
+ IN VOID *ProcedureArgument OPTIONAL\r
)\r
{\r
- EFI_PEI_HOB_POINTERS Hob;\r
- UINTN WakeupBufferStart;\r
- UINTN WakeupBufferEnd;\r
-\r
- //\r
- // Get the HOB list for processing\r
- //\r
- Hob.Raw = GetHobList ();\r
-\r
- //\r
- // Collect memory ranges\r
- //\r
- while (!END_OF_HOB_LIST (Hob)) {\r
- if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {\r
- if ((Hob.ResourceDescriptor->PhysicalStart < BASE_1MB) &&\r
- (Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) &&\r
- ((Hob.ResourceDescriptor->ResourceAttribute &\r
- (EFI_RESOURCE_ATTRIBUTE_READ_PROTECTED |\r
- EFI_RESOURCE_ATTRIBUTE_WRITE_PROTECTED |\r
- EFI_RESOURCE_ATTRIBUTE_EXECUTION_PROTECTED\r
- )) == 0)\r
- ) {\r
- //\r
- // Need memory under 1MB to be collected here\r
- //\r
- WakeupBufferEnd = (UINTN) (Hob.ResourceDescriptor->PhysicalStart + Hob.ResourceDescriptor->ResourceLength);\r
- if (WakeupBufferEnd > BASE_1MB) {\r
- //\r
- // Wakeup buffer should be under 1MB\r
- //\r
- WakeupBufferEnd = BASE_1MB;\r
- }\r
- //\r
- // Wakeup buffer should be aligned on 4KB\r
- //\r
- WakeupBufferStart = (WakeupBufferEnd - WakeupBufferSize) & ~(SIZE_4KB - 1);\r
- if (WakeupBufferStart < Hob.ResourceDescriptor->PhysicalStart) {\r
- continue;\r
- }\r
- //\r
- // Create a memory allocation HOB.\r
- //\r
- BuildMemoryAllocationHob (\r
- WakeupBufferStart,\r
- WakeupBufferSize,\r
- EfiBootServicesData\r
- );\r
- return WakeupBufferStart;\r
- }\r
- }\r
- //\r
- // Find the next HOB\r
- //\r
- Hob.Raw = GET_NEXT_HOB (Hob);\r
- }\r
-\r
- return (UINTN) -1;\r
+ return MpInitLibStartupAllAPs (\r
+ Procedure,\r
+ SingleThread,\r
+ NULL,\r
+ TimeoutInMicroSeconds,\r
+ ProcedureArgument,\r
+ NULL\r
+ );\r
}\r
\r
/**\r
- Get available system memory below 1MB by specified size.\r
-\r
- @param PeiCpuMpData Pointer to PEI CPU MP Data\r
+ This service lets the caller get one enabled AP to execute a caller-provided\r
+ function. The caller can request the BSP to wait for the completion\r
+ of the AP. This service may only be called from the BSP.\r
+\r
+ This function is used to dispatch one enabled AP to the function specified by\r
+ Procedure passing in the argument specified by ProcedureArgument.\r
+ The execution is in blocking mode. The BSP waits until the AP finishes or\r
+ TimeoutInMicroSecondss expires.\r
+\r
+ If the timeout specified by TimeoutInMicroseconds expires before the AP returns\r
+ from Procedure, then execution of Procedure by the AP is terminated. The AP is\r
+ available for subsequent calls to EFI_PEI_MP_SERVICES_PPI.StartupAllAPs() and\r
+ EFI_PEI_MP_SERVICES_PPI.StartupThisAP().\r
+\r
+ @param[in] PeiServices An indirect pointer to the PEI Services Table\r
+ published by the PEI Foundation.\r
+ @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance.\r
+ @param[in] Procedure A pointer to the function to be run on enabled APs of\r
+ the system.\r
+ @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the\r
+ total number of logical processors minus 1. The total\r
+ number of logical processors can be retrieved by\r
+ EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors().\r
+ @param[in] TimeoutInMicroseconds\r
+ Indicates the time limit in microseconds for APs to\r
+ return from Procedure, for blocking mode only. Zero\r
+ means infinity. If the timeout expires before all APs\r
+ return from Procedure, then Procedure on the failed APs\r
+ is terminated. All enabled APs are available for next\r
+ function assigned by EFI_PEI_MP_SERVICES_PPI.StartupAllAPs()\r
+ or EFI_PEI_MP_SERVICES_PPI.StartupThisAP(). If the\r
+ timeout expires in blocking mode, BSP returns\r
+ EFI_TIMEOUT.\r
+ @param[in] ProcedureArgument The parameter passed into Procedure for all APs.\r
+\r
+ @retval EFI_SUCCESS In blocking mode, specified AP finished before the\r
+ timeout expires.\r
+ @retval EFI_DEVICE_ERROR The calling processor is an AP.\r
+ @retval EFI_TIMEOUT In blocking mode, the timeout expired before the\r
+ specified AP has finished.\r
+ @retval EFI_NOT_FOUND The processor with the handle specified by\r
+ ProcessorNumber does not exist.\r
+ @retval EFI_INVALID_PARAMETER ProcessorNumber specifies the BSP or disabled AP.\r
+ @retval EFI_INVALID_PARAMETER Procedure is NULL.\r
**/\r
-VOID\r
-BackupAndPrepareWakeupBuffer(\r
- IN PEI_CPU_MP_DATA *PeiCpuMpData\r
- )\r
-{\r
- CopyMem (\r
- (VOID *) PeiCpuMpData->BackupBuffer,\r
- (VOID *) PeiCpuMpData->WakeupBuffer,\r
- PeiCpuMpData->BackupBufferSize\r
- );\r
- CopyMem (\r
- (VOID *) PeiCpuMpData->WakeupBuffer,\r
- (VOID *) PeiCpuMpData->AddressMap.RendezvousFunnelAddress,\r
- PeiCpuMpData->AddressMap.RendezvousFunnelSize\r
- );\r
-}\r
-\r
-/**\r
- Restore wakeup buffer data.\r
-\r
- @param PeiCpuMpData Pointer to PEI CPU MP Data\r
-**/\r
-VOID\r
-RestoreWakeupBuffer(\r
- IN PEI_CPU_MP_DATA *PeiCpuMpData\r
+EFI_STATUS\r
+EFIAPI\r
+PeiStartupThisAP (\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_MP_SERVICES_PPI *This,\r
+ IN EFI_AP_PROCEDURE Procedure,\r
+ IN UINTN ProcessorNumber,\r
+ IN UINTN TimeoutInMicroseconds,\r
+ IN VOID *ProcedureArgument OPTIONAL\r
)\r
{\r
- CopyMem ((VOID *) PeiCpuMpData->WakeupBuffer, (VOID *) PeiCpuMpData->BackupBuffer, PeiCpuMpData->BackupBufferSize);\r
+ return MpInitLibStartupThisAP (\r
+ Procedure,\r
+ ProcessorNumber,\r
+ NULL,\r
+ TimeoutInMicroseconds,\r
+ ProcedureArgument,\r
+ NULL\r
+ );\r
}\r
\r
/**\r
- This function will get CPU count in the system.\r
-\r
- @param PeiCpuMpData Pointer to PEI CPU MP Data\r
-\r
- @return AP processor count\r
+ This service switches the requested AP to be the BSP from that point onward.\r
+ This service changes the BSP for all purposes. This call can only be performed\r
+ by the current BSP.\r
+\r
+ This service switches the requested AP to be the BSP from that point onward.\r
+ This service changes the BSP for all purposes. The new BSP can take over the\r
+ execution of the old BSP and continue seamlessly from where the old one left\r
+ off.\r
+\r
+ If the BSP cannot be switched prior to the return from this service, then\r
+ EFI_UNSUPPORTED must be returned.\r
+\r
+ @param[in] PeiServices An indirect pointer to the PEI Services Table\r
+ published by the PEI Foundation.\r
+ @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance.\r
+ @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the\r
+ total number of logical processors minus 1. The total\r
+ number of logical processors can be retrieved by\r
+ EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors().\r
+ @param[in] EnableOldBSP If TRUE, then the old BSP will be listed as an enabled\r
+ AP. Otherwise, it will be disabled.\r
+\r
+ @retval EFI_SUCCESS BSP successfully switched.\r
+ @retval EFI_UNSUPPORTED Switching the BSP cannot be completed prior to this\r
+ service returning.\r
+ @retval EFI_UNSUPPORTED Switching the BSP is not supported.\r
+ @retval EFI_DEVICE_ERROR The calling processor is an AP.\r
+ @retval EFI_NOT_FOUND The processor with the handle specified by\r
+ ProcessorNumber does not exist.\r
+ @retval EFI_INVALID_PARAMETER ProcessorNumber specifies the current BSP or a disabled\r
+ AP.\r
+ @retval EFI_NOT_READY The specified AP is busy.\r
**/\r
-UINT32\r
-CountProcessorNumber (\r
- IN PEI_CPU_MP_DATA *PeiCpuMpData\r
+EFI_STATUS\r
+EFIAPI\r
+PeiSwitchBSP (\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_MP_SERVICES_PPI *This,\r
+ IN UINTN ProcessorNumber,\r
+ IN BOOLEAN EnableOldBSP\r
)\r
{\r
- //\r
- // Load Microcode on BSP\r
- //\r
- MicrocodeDetect (PeiCpuMpData);\r
- //\r
- // Store BSP's MTRR setting\r
- //\r
- MtrrGetAllMtrrs (&PeiCpuMpData->MtrrTable);\r
-\r
- //\r
- // Only perform AP detection if PcdCpuMaxLogicalProcessorNumber is greater than 1\r
- //\r
- if (PcdGet32 (PcdCpuMaxLogicalProcessorNumber) > 1) {\r
- //\r
- // Send 1st broadcast IPI to APs to wakeup APs\r
- //\r
- PeiCpuMpData->InitFlag = TRUE;\r
- PeiCpuMpData->X2ApicEnable = FALSE;\r
- WakeUpAP (PeiCpuMpData, TRUE, 0, NULL, NULL);\r
- //\r
- // Wait for AP task to complete and then exit.\r
- //\r
- MicroSecondDelay (PcdGet32 (PcdCpuApInitTimeOutInMicroSeconds));\r
- PeiCpuMpData->InitFlag = FALSE;\r
- PeiCpuMpData->CpuCount += (UINT32)PeiCpuMpData->MpCpuExchangeInfo->NumApsExecuting;\r
- ASSERT (PeiCpuMpData->CpuCount <= PcdGet32 (PcdCpuMaxLogicalProcessorNumber));\r
- //\r
- // Wait for all APs finished the initialization\r
- //\r
- while (PeiCpuMpData->FinishedCount < (PeiCpuMpData->CpuCount - 1)) {\r
- CpuPause ();\r
- }\r
-\r
- if (PeiCpuMpData->X2ApicEnable) {\r
- DEBUG ((EFI_D_INFO, "Force x2APIC mode!\n"));\r
- //\r
- // Wakeup all APs to enable x2APIC mode\r
- //\r
- WakeUpAP (PeiCpuMpData, TRUE, 0, ApFuncEnableX2Apic, NULL);\r
- //\r
- // Wait for all known APs finished\r
- //\r
- while (PeiCpuMpData->FinishedCount < (PeiCpuMpData->CpuCount - 1)) {\r
- CpuPause ();\r
- }\r
- //\r
- // Enable x2APIC on BSP\r
- //\r
- SetApicMode (LOCAL_APIC_MODE_X2APIC);\r
- }\r
- DEBUG ((EFI_D_INFO, "APIC MODE is %d\n", GetApicMode ()));\r
- //\r
- // Sort BSP/Aps by CPU APIC ID in ascending order\r
- //\r
- SortApicId (PeiCpuMpData);\r
- }\r
-\r
- DEBUG ((EFI_D_INFO, "CpuMpPei: Find %d processors in system.\n", PeiCpuMpData->CpuCount));\r
- return PeiCpuMpData->CpuCount;\r
+ return MpInitLibSwitchBSP (ProcessorNumber, EnableOldBSP);\r
}\r
\r
/**\r
- Prepare for AP wakeup buffer and copy AP reset code into it.\r
-\r
- Get wakeup buffer below 1MB. Allocate memory for CPU MP Data and APs Stack.\r
-\r
- @return Pointer to PEI CPU MP Data\r
+ This service lets the caller enable or disable an AP from this point onward.\r
+ This service may only be called from the BSP.\r
+\r
+ This service allows the caller enable or disable an AP from this point onward.\r
+ The caller can optionally specify the health status of the AP by Health. If\r
+ an AP is being disabled, then the state of the disabled AP is implementation\r
+ dependent. If an AP is enabled, then the implementation must guarantee that a\r
+ complete initialization sequence is performed on the AP, so the AP is in a state\r
+ that is compatible with an MP operating system.\r
+\r
+ If the enable or disable AP operation cannot be completed prior to the return\r
+ from this service, then EFI_UNSUPPORTED must be returned.\r
+\r
+ @param[in] PeiServices An indirect pointer to the PEI Services Table\r
+ published by the PEI Foundation.\r
+ @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance.\r
+ @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the\r
+ total number of logical processors minus 1. The total\r
+ number of logical processors can be retrieved by\r
+ EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors().\r
+ @param[in] EnableAP Specifies the new state for the processor for enabled,\r
+ FALSE for disabled.\r
+ @param[in] HealthFlag If not NULL, a pointer to a value that specifies the\r
+ new health status of the AP. This flag corresponds to\r
+ StatusFlag defined in EFI_PEI_MP_SERVICES_PPI.GetProcessorInfo().\r
+ Only the PROCESSOR_HEALTH_STATUS_BIT is used. All other\r
+ bits are ignored. If it is NULL, this parameter is\r
+ ignored.\r
+\r
+ @retval EFI_SUCCESS The specified AP was enabled or disabled successfully.\r
+ @retval EFI_UNSUPPORTED Enabling or disabling an AP cannot be completed prior\r
+ to this service returning.\r
+ @retval EFI_UNSUPPORTED Enabling or disabling an AP is not supported.\r
+ @retval EFI_DEVICE_ERROR The calling processor is an AP.\r
+ @retval EFI_NOT_FOUND Processor with the handle specified by ProcessorNumber\r
+ does not exist.\r
+ @retval EFI_INVALID_PARAMETER ProcessorNumber specifies the BSP.\r
**/\r
-PEI_CPU_MP_DATA *\r
-PrepareAPStartupVector (\r
- VOID\r
+EFI_STATUS\r
+EFIAPI\r
+PeiEnableDisableAP (\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_MP_SERVICES_PPI *This,\r
+ IN UINTN ProcessorNumber,\r
+ IN BOOLEAN EnableAP,\r
+ IN UINT32 *HealthFlag OPTIONAL\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT32 MaxCpuCount;\r
- PEI_CPU_MP_DATA *PeiCpuMpData;\r
- EFI_PHYSICAL_ADDRESS Buffer;\r
- UINTN BufferSize;\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
- WakeupBuffer = GetWakeupBuffer ((WakeupBufferSize + SIZE_4KB - 1) & ~(SIZE_4KB - 1));\r
- ASSERT (WakeupBuffer != (UINTN) -1);\r
- DEBUG ((EFI_D_INFO, "CpuMpPei: WakeupBuffer = 0x%x\n", WakeupBuffer));\r
-\r
- //\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
- &Buffer\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- PeiCpuMpData = (PEI_CPU_MP_DATA *) (UINTN) (Buffer + PcdGet32 (PcdCpuApStackSize) * MaxCpuCount);\r
- PeiCpuMpData->Buffer = (UINTN) Buffer;\r
- PeiCpuMpData->CpuApStackSize = PcdGet32 (PcdCpuApStackSize);\r
- PeiCpuMpData->WakeupBuffer = WakeupBuffer;\r
- PeiCpuMpData->BackupBuffer = (UINTN)PeiCpuMpData + sizeof (PEI_CPU_MP_DATA);\r
- PeiCpuMpData->BackupBufferSize = WakeupBufferSize;\r
- PeiCpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *) (UINTN) (WakeupBuffer + AddressMap.RendezvousFunnelSize);\r
-\r
- PeiCpuMpData->CpuCount = 1;\r
- PeiCpuMpData->BspNumber = 0;\r
- PeiCpuMpData->CpuData = (PEI_CPU_DATA *) (PeiCpuMpData->BackupBuffer +\r
- PeiCpuMpData->BackupBufferSize);\r
- PeiCpuMpData->CpuData[0].ApicId = GetInitialApicId ();\r
- PeiCpuMpData->CpuData[0].Health.Uint32 = 0;\r
- PeiCpuMpData->EndOfPeiFlag = FALSE;\r
- InitializeSpinLock(&PeiCpuMpData->MpLock);\r
- SaveVolatileRegisters (&PeiCpuMpData->CpuData[0].VolatileRegisters);\r
- CopyMem (&PeiCpuMpData->AddressMap, &AddressMap, sizeof (MP_ASSEMBLY_ADDRESS_MAP));\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
- BackupAndPrepareWakeupBuffer(PeiCpuMpData);\r
-\r
- return PeiCpuMpData;\r
+ return MpInitLibEnableDisableAP (ProcessorNumber, EnableAP, HealthFlag);\r
}\r
\r
/**\r
- Notify function on End Of Pei PPI.\r
-\r
- On S3 boot, this function will restore wakeup buffer data.\r
- On normal boot, this function will flag wakeup buffer to be un-used type.\r
-\r
- @param PeiServices The pointer to the PEI Services Table.\r
- @param NotifyDescriptor Address of the notification descriptor data structure.\r
- @param Ppi Address of the PPI that was installed.\r
-\r
- @retval EFI_SUCCESS When everything is OK.\r
-\r
+ This return the handle number for the calling processor. This service may be\r
+ called from the BSP and APs.\r
+\r
+ This service returns the processor handle number for the calling processor.\r
+ The returned value is in the range from 0 to the total number of logical\r
+ processors minus 1. The total number of logical processors can be retrieved\r
+ with EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors(). This service may be\r
+ called from the BSP and APs. If ProcessorNumber is NULL, then EFI_INVALID_PARAMETER\r
+ is returned. Otherwise, the current processors handle number is returned in\r
+ ProcessorNumber, and EFI_SUCCESS is returned.\r
+\r
+ @param[in] PeiServices An indirect pointer to the PEI Services Table\r
+ published by the PEI Foundation.\r
+ @param[in] This A pointer to the EFI_PEI_MP_SERVICES_PPI instance.\r
+ @param[out] ProcessorNumber The handle number of the AP. The range is from 0 to the\r
+ total number of logical processors minus 1. The total\r
+ number of logical processors can be retrieved by\r
+ EFI_PEI_MP_SERVICES_PPI.GetNumberOfProcessors().\r
+\r
+ @retval EFI_SUCCESS The current processor handle number was returned in\r
+ ProcessorNumber.\r
+ @retval EFI_INVALID_PARAMETER ProcessorNumber is NULL.\r
**/\r
EFI_STATUS\r
EFIAPI\r
-CpuMpEndOfPeiCallback (\r
- IN EFI_PEI_SERVICES **PeiServices,\r
- IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor,\r
- IN VOID *Ppi\r
+PeiWhoAmI (\r
+ IN CONST EFI_PEI_SERVICES **PeiServices,\r
+ IN EFI_PEI_MP_SERVICES_PPI *This,\r
+ OUT UINTN *ProcessorNumber\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_BOOT_MODE BootMode;\r
- PEI_CPU_MP_DATA *PeiCpuMpData;\r
- EFI_PEI_HOB_POINTERS Hob;\r
- EFI_HOB_MEMORY_ALLOCATION *MemoryHob;\r
-\r
- DEBUG ((EFI_D_INFO, "CpuMpPei: CpuMpEndOfPeiCallback () invoked\n"));\r
-\r
- Status = PeiServicesGetBootMode (&BootMode);\r
- ASSERT_EFI_ERROR (Status);\r
-\r
- PeiCpuMpData = GetMpHobData ();\r
- ASSERT (PeiCpuMpData != NULL);\r
-\r
- if (BootMode != BOOT_ON_S3_RESUME) {\r
- //\r
- // Get the HOB list for processing\r
- //\r
- Hob.Raw = GetHobList ();\r
- //\r
- // Collect memory ranges\r
- //\r
- while (!END_OF_HOB_LIST (Hob)) {\r
- if (Hob.Header->HobType == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
- MemoryHob = Hob.MemoryAllocation;\r
- if(MemoryHob->AllocDescriptor.MemoryBaseAddress == PeiCpuMpData->WakeupBuffer) {\r
- //\r
- // Flag this HOB type to un-used\r
- //\r
- GET_HOB_TYPE (Hob) = EFI_HOB_TYPE_UNUSED;\r
- break;\r
- }\r
- }\r
- Hob.Raw = GET_NEXT_HOB (Hob);\r
- }\r
- } else {\r
- RestoreWakeupBuffer (PeiCpuMpData);\r
- PeiCpuMpData->EndOfPeiFlag = TRUE;\r
- }\r
- return EFI_SUCCESS;\r
+ return MpInitLibWhoAmI (ProcessorNumber);\r
}\r
\r
/**\r
IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
{\r
- EFI_STATUS Status;\r
- PEI_CPU_MP_DATA *PeiCpuMpData;\r
+ EFI_STATUS Status;\r
EFI_VECTOR_HANDOFF_INFO *VectorInfo;\r
EFI_PEI_VECTOR_HANDOFF_INFO_PPI *VectorHandoffInfoPpi;\r
\r
- //\r
- // Load new GDT table on BSP\r
- //\r
- AsmInitializeGdt (&mGdt);\r
//\r
// Get Vector Hand-off Info PPI\r
//\r
}\r
Status = InitializeCpuExceptionHandlers (VectorInfo);\r
ASSERT_EFI_ERROR (Status);\r
+ \r
//\r
- // Get wakeup buffer and copy AP reset code in it\r
- //\r
- PeiCpuMpData = PrepareAPStartupVector ();\r
- //\r
- // Count processor number and collect processor information\r
- //\r
- CountProcessorNumber (PeiCpuMpData);\r
- //\r
- // Build location of PEI CPU MP DATA buffer in HOB\r
+ // Wakeup APs to do initialization\r
//\r
- BuildGuidDataHob (\r
- &gEfiCallerIdGuid,\r
- (VOID *)&PeiCpuMpData,\r
- sizeof(UINT64)\r
- );\r
+ Status = MpInitLibInitialize ();\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
//\r
// Update and publish CPU BIST information\r
//\r
- CollectBistDataFromPpi (PeiServices, PeiCpuMpData);\r
- //\r
- // register an event for EndOfPei\r
- //\r
- Status = PeiServicesNotifyPpi (&mNotifyList);\r
- ASSERT_EFI_ERROR (Status);\r
+ CollectBistDataFromPpi (PeiServices);\r
+\r
//\r
// Install CPU MP PPI\r
//\r
projects / mirror_edk2.git / blobdiff