X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=UefiCpuPkg%2FCpuDxe%2FCpuMp.c;h=56ba02615203ea560686a2c982b13608b92802f3;hp=8f7a56c40daa2bbb1559061f9871d5859571f124;hb=147fd35c3e389ecd025dbfd243312bf5b22da7c9;hpb=0b9f0dd635b82cad34fcd47e20ce9c0c9c46c893 diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/UefiCpuPkg/CpuDxe/CpuMp.c index 8f7a56c40d..56ba026152 100644 --- a/UefiCpuPkg/CpuDxe/CpuMp.c +++ b/UefiCpuPkg/CpuDxe/CpuMp.c @@ -1,7 +1,7 @@ /** @file CPU DXE Module to produce CPU MP Protocol. - Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.
+ Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -15,20 +15,8 @@ #include "CpuDxe.h" #include "CpuMp.h" -UINTN gMaxLogicalProcessorNumber; -UINTN gApStackSize; -UINTN gPollInterval = 100; // 100 microseconds - -MP_SYSTEM_DATA mMpSystemData; EFI_HANDLE mMpServiceHandle = NULL; UINTN mNumberOfProcessors = 1; -EFI_EVENT mExitBootServicesEvent = (EFI_EVENT)NULL; - -VOID *mCommonStack = 0; -VOID *mTopOfApCommonStack = 0; -VOID *mApStackStart = 0; - -volatile BOOLEAN mAPsAlreadyInitFinished = FALSE; EFI_MP_SERVICES_PROTOCOL mMpServicesTemplate = { GetNumberOfProcessors, @@ -40,372 +28,6 @@ EFI_MP_SERVICES_PROTOCOL mMpServicesTemplate = { WhoAmI }; -/** - Get Mp Service Lock. - - @param CpuData the pointer to CPU_DATA_BLOCK of specified processor - -**/ -VOID -GetMpSpinLock ( - IN CPU_DATA_BLOCK *CpuData - ) -{ - while (!AcquireSpinLockOrFail (&CpuData->CpuDataLock)) { - CpuPause (); - } - CpuData->LockSelf = GetApicId (); -} - -/** - Release Mp Service Lock. - - @param CpuData the pointer to CPU_DATA_BLOCK of specified processor - -**/ -VOID -ReleaseMpSpinLock ( - IN CPU_DATA_BLOCK *CpuData - ) -{ - ReleaseSpinLock (&CpuData->CpuDataLock); -} - -/** - Check whether caller processor is BSP. - - @retval TRUE the caller is BSP - @retval FALSE the caller is AP - -**/ -BOOLEAN -IsBSP ( - VOID - ) -{ - UINTN CpuIndex; - CPU_DATA_BLOCK *CpuData; - - CpuData = NULL; - - WhoAmI (&mMpServicesTemplate, &CpuIndex); - CpuData = &mMpSystemData.CpuDatas[CpuIndex]; - - return CpuData->Info.StatusFlag & PROCESSOR_AS_BSP_BIT ? TRUE : FALSE; -} - -/** - Get the Application Processors state. - - @param CpuData the pointer to CPU_DATA_BLOCK of specified AP - - @retval CPU_STATE the AP status - -**/ -STATIC -CPU_STATE -GetApState ( - IN CPU_DATA_BLOCK *CpuData - ) -{ - CPU_STATE State; - - GetMpSpinLock (CpuData); - State = CpuData->State; - ReleaseMpSpinLock (CpuData); - - return State; -} - -/** - Set the Application Processors state. - - @param CpuData The pointer to CPU_DATA_BLOCK of specified AP - @param State The AP status - -**/ -STATIC -VOID -SetApState ( - IN CPU_DATA_BLOCK *CpuData, - IN CPU_STATE State - ) -{ - GetMpSpinLock (CpuData); - CpuData->State = State; - ReleaseMpSpinLock (CpuData); -} - -/** - Set the Application Processor prepare to run a function specified - by Params. - - @param CpuData the pointer to CPU_DATA_BLOCK of specified AP - @param Procedure A pointer to the function to be run on enabled APs of the system - @param ProcedureArgument Pointer to the optional parameter of the assigned function - -**/ -VOID -SetApProcedure ( - IN CPU_DATA_BLOCK *CpuData, - IN EFI_AP_PROCEDURE Procedure, - IN VOID *ProcedureArgument - ) -{ - GetMpSpinLock (CpuData); - CpuData->Parameter = ProcedureArgument; - CpuData->Procedure = Procedure; - ReleaseMpSpinLock (CpuData); -} - -/** - Check the Application Processors Status whether contains the Flags. - - @param CpuData the pointer to CPU_DATA_BLOCK of specified AP - @param Flags the StatusFlag describing in EFI_PROCESSOR_INFORMATION - - @retval TRUE the AP status includes the StatusFlag - @retval FALSE the AP status excludes the StatusFlag - -**/ -BOOLEAN -TestCpuStatusFlag ( - IN CPU_DATA_BLOCK *CpuData, - IN UINT32 Flags - ) -{ - UINT32 Ret; - - GetMpSpinLock (CpuData); - Ret = CpuData->Info.StatusFlag & Flags; - ReleaseMpSpinLock (CpuData); - - return (BOOLEAN) (Ret != 0); -} - -/** - Bitwise-Or of the Application Processors Status with the Flags. - - @param CpuData the pointer to CPU_DATA_BLOCK of specified AP - @param Flags the StatusFlag describing in EFI_PROCESSOR_INFORMATION - -**/ -VOID -CpuStatusFlagOr ( - IN CPU_DATA_BLOCK *CpuData, - IN UINT32 Flags - ) -{ - GetMpSpinLock (CpuData); - CpuData->Info.StatusFlag |= Flags; - ReleaseMpSpinLock (CpuData); -} - -/** - Bitwise-AndNot of the Application Processors Status with the Flags. - - @param CpuData the pointer to CPU_DATA_BLOCK of specified AP - @param Flags the StatusFlag describing in EFI_PROCESSOR_INFORMATION - -**/ -VOID -CpuStatusFlagAndNot ( - IN CPU_DATA_BLOCK *CpuData, - IN UINT32 Flags - ) -{ - GetMpSpinLock (CpuData); - CpuData->Info.StatusFlag &= ~Flags; - ReleaseMpSpinLock (CpuData); -} - -/** - Searches for the next blocking AP. - - Search for the next AP that is put in blocking state by single-threaded StartupAllAPs(). - - @param NextNumber Pointer to the processor number of the next blocking AP. - - @retval EFI_SUCCESS The next blocking AP has been found. - @retval EFI_NOT_FOUND No blocking AP exists. - -**/ -EFI_STATUS -GetNextBlockedNumber ( - OUT UINTN *NextNumber - ) -{ - UINTN Number; - CPU_STATE CpuState; - CPU_DATA_BLOCK *CpuData; - - for (Number = 0; Number < mMpSystemData.NumberOfProcessors; Number++) { - CpuData = &mMpSystemData.CpuDatas[Number]; - if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT)) { - // - // Skip BSP - // - continue; - } - - CpuState = GetApState (CpuData); - if (CpuState == CpuStateBlocked) { - *NextNumber = Number; - return EFI_SUCCESS; - } - } - - return EFI_NOT_FOUND; -} - -/** - Check if the APs state are finished, and update them to idle state - by StartupAllAPs(). - -**/ -VOID -CheckAndUpdateAllAPsToIdleState ( - VOID - ) -{ - UINTN ProcessorNumber; - UINTN NextNumber; - CPU_DATA_BLOCK *CpuData; - EFI_STATUS Status; - CPU_STATE CpuState; - - for (ProcessorNumber = 0; ProcessorNumber < mMpSystemData.NumberOfProcessors; ProcessorNumber++) { - CpuData = &mMpSystemData.CpuDatas[ProcessorNumber]; - if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT)) { - // - // Skip BSP - // - continue; - } - - if (!TestCpuStatusFlag (CpuData, PROCESSOR_ENABLED_BIT)) { - // - // Skip Disabled processors - // - continue; - } - - CpuState = GetApState (CpuData); - if (CpuState == CpuStateFinished) { - mMpSystemData.FinishCount++; - if (mMpSystemData.SingleThread) { - Status = GetNextBlockedNumber (&NextNumber); - if (!EFI_ERROR (Status)) { - SetApState (&mMpSystemData.CpuDatas[NextNumber], CpuStateReady); - SetApProcedure (&mMpSystemData.CpuDatas[NextNumber], - mMpSystemData.Procedure, - mMpSystemData.ProcedureArgument); - // - // If this AP previous state is blocked, we should - // wake up this AP by sent a SIPI. and avoid - // re-involve the sleeping state. we must call - // SetApProcedure() first. - // - ResetProcessorToIdleState (&mMpSystemData.CpuDatas[NextNumber]); - } - } - SetApState (CpuData, CpuStateIdle); - } - } -} - -/** - Check if all APs are in state CpuStateSleeping. - - Return TRUE if all APs are in the CpuStateSleeping state. Do not - check the state of the BSP or any disabled APs. - - @retval TRUE All APs are in CpuStateSleeping state. - @retval FALSE One or more APs are not in CpuStateSleeping state. - -**/ -BOOLEAN -CheckAllAPsSleeping ( - VOID - ) -{ - UINTN ProcessorNumber; - CPU_DATA_BLOCK *CpuData; - - for (ProcessorNumber = 0; ProcessorNumber < mMpSystemData.NumberOfProcessors; ProcessorNumber++) { - CpuData = &mMpSystemData.CpuDatas[ProcessorNumber]; - if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT)) { - // - // Skip BSP - // - continue; - } - - if (!TestCpuStatusFlag (CpuData, PROCESSOR_ENABLED_BIT)) { - // - // Skip Disabled processors - // - continue; - } - - if (GetApState (CpuData) != CpuStateSleeping) { - return FALSE; - } - } - return TRUE; -} - -/** - If the timeout expires before all APs returns from Procedure, - we should forcibly terminate the executing AP and fill FailedList back - by StartupAllAPs(). - -**/ -VOID -ResetAllFailedAPs ( - VOID - ) -{ - CPU_DATA_BLOCK *CpuData; - UINTN Number; - CPU_STATE CpuState; - - if (mMpSystemData.FailedList != NULL) { - *mMpSystemData.FailedList = AllocatePool ((mMpSystemData.StartCount - mMpSystemData.FinishCount + 1) * sizeof(UINTN)); - ASSERT (*mMpSystemData.FailedList != NULL); - } - - for (Number = 0; Number < mMpSystemData.NumberOfProcessors; Number++) { - CpuData = &mMpSystemData.CpuDatas[Number]; - if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT)) { - // - // Skip BSP - // - continue; - } - - if (!TestCpuStatusFlag (CpuData, PROCESSOR_ENABLED_BIT)) { - // - // Skip Disabled processors - // - continue; - } - - CpuState = GetApState (CpuData); - if (CpuState != CpuStateIdle && - CpuState != CpuStateSleeping) { - if (mMpSystemData.FailedList != NULL) { - (*mMpSystemData.FailedList)[mMpSystemData.FailedListIndex++] = Number; - } - ResetProcessorToIdleState (CpuData); - } - } - - if (mMpSystemData.FailedList != NULL) { - (*mMpSystemData.FailedList)[mMpSystemData.FailedListIndex] = END_OF_CPU_LIST; - } -} - /** This service retrieves the number of logical processor in the platform and the number of those logical processors that are enabled on this boot. @@ -677,8 +299,8 @@ StartupAllAPs ( @param[in] This A pointer to the EFI_MP_SERVICES_PROTOCOL instance. - @param[in] Procedure A pointer to the function to be run on - enabled APs of the system. See type + @param[in] Procedure A pointer to the function to be run on the + designated AP of the system. See type EFI_AP_PROCEDURE. @param[in] ProcessorNumber The handle number of the AP. The range is from 0 to the total number of logical @@ -687,13 +309,13 @@ StartupAllAPs ( EFI_MP_SERVICES_PROTOCOL.GetNumberOfProcessors(). @param[in] WaitEvent The event created by the caller with CreateEvent() service. If it is NULL, then execute in - blocking mode. BSP waits until all APs finish - or TimeoutInMicroseconds expires. If it's + blocking mode. BSP waits until this AP finish + or TimeoutInMicroSeconds expires. If it's not NULL, then execute in non-blocking mode. BSP requests the function specified by - Procedure to be started on all the enabled - APs, and go on executing immediately. If - all return from Procedure or TimeoutInMicroseconds + Procedure to be started on this AP, + and go on executing immediately. If this AP + return from Procedure or TimeoutInMicroSeconds expires, this event is signaled. The BSP can use the CheckEvent() or WaitForEvent() services to check the state of event. Type @@ -701,20 +323,20 @@ StartupAllAPs ( the Unified Extensible Firmware Interface Specification. @param[in] TimeoutInMicroseconds Indicates the time limit in microseconds for - APs to return from Procedure, either for + this AP to finish this Procedure, either for blocking or non-blocking mode. Zero means infinity. If the timeout expires before - all APs return from Procedure, then Procedure - on the failed APs is terminated. All enabled - APs are available for next function assigned + this AP returns from Procedure, then Procedure + on the AP is terminated. The + AP is available for next function assigned by EFI_MP_SERVICES_PROTOCOL.StartupAllAPs() or EFI_MP_SERVICES_PROTOCOL.StartupThisAP(). If the timeout expires in blocking mode, BSP returns EFI_TIMEOUT. If the timeout expires in non-blocking mode, WaitEvent is signaled with SignalEvent(). - @param[in] ProcedureArgument The parameter passed into Procedure for - all APs. + @param[in] ProcedureArgument The parameter passed into Procedure on the + specified AP. @param[out] Finished If NULL, this parameter is ignored. In blocking mode, this parameter is ignored. In non-blocking mode, if AP returns from @@ -790,7 +412,7 @@ StartupThisAP ( @retval EFI_UNSUPPORTED Switching the BSP cannot be completed prior to this service returning. @retval EFI_UNSUPPORTED Switching the BSP is not supported. - @retval EFI_SUCCESS The calling processor is an AP. + @retval EFI_DEVICE_ERROR The calling processor is an AP. @retval EFI_NOT_FOUND The processor with the handle specified by ProcessorNumber does not exist. @retval EFI_INVALID_PARAMETER ProcessorNumber specifies the current BSP or @@ -825,8 +447,8 @@ SwitchBSP ( from this service, then EFI_UNSUPPORTED must be returned. @param[in] This A pointer to the EFI_MP_SERVICES_PROTOCOL instance. - @param[in] ProcessorNumber The handle number of AP that is to become the new - BSP. The range is from 0 to the total number of + @param[in] ProcessorNumber The handle number of AP. + The range is from 0 to the total number of logical processors minus 1. The total number of logical processors can be retrieved by EFI_MP_SERVICES_PROTOCOL.GetNumberOfProcessors(). @@ -875,8 +497,8 @@ EnableDisableAP ( ProcessorNumber, and EFI_SUCCESS is returned. @param[in] This A pointer to the EFI_MP_SERVICES_PROTOCOL instance. - @param[out] ProcessorNumber The handle number of AP that is to become the new - BSP. The range is from 0 to the total number of + @param[out] ProcessorNumber Pointer to the handle number of AP. + The range is from 0 to the total number of logical processors minus 1. The total number of logical processors can be retrieved by EFI_MP_SERVICES_PROTOCOL.GetNumberOfProcessors(). @@ -917,6 +539,7 @@ CollectBistDataFromHob ( UINTN ProcessorNumber; EFI_PROCESSOR_INFORMATION ProcessorInfo; EFI_HEALTH_FLAGS BistData; + UINTN CpuInstanceNumber; SecPlatformInformation2 = NULL; SecPlatformInformation = NULL; @@ -948,7 +571,7 @@ CollectBistDataFromHob ( BspCpuInstance.InfoRecord.IA32HealthFlags.Uint32 = SecPlatformInformation->IA32HealthFlags.Uint32; CpuInstance = &BspCpuInstance; } else { - DEBUG ((EFI_D_INFO, "Does not find any HOB stored CPU BIST information!\n")); + DEBUG ((DEBUG_INFO, "Does not find any HOB stored CPU BIST information!\n")); // // Does not find any HOB stored BIST information // @@ -956,48 +579,210 @@ CollectBistDataFromHob ( } } - while ((NumberOfData--) > 0) { - for (ProcessorNumber = 0; ProcessorNumber < mNumberOfProcessors; ProcessorNumber++) { - MpInitLibGetProcessorInfo (ProcessorNumber, &ProcessorInfo, &BistData); - if (ProcessorInfo.ProcessorId == CpuInstance[NumberOfData].CpuLocation) { + for (ProcessorNumber = 0; ProcessorNumber < mNumberOfProcessors; ProcessorNumber++) { + MpInitLibGetProcessorInfo (ProcessorNumber, &ProcessorInfo, &BistData); + for (CpuInstanceNumber = 0; CpuInstanceNumber < NumberOfData; CpuInstanceNumber++) { + if (ProcessorInfo.ProcessorId == CpuInstance[CpuInstanceNumber].CpuLocation) { // // Update CPU health status for MP Services Protocol according to BIST data. // - BistData = CpuInstance[NumberOfData].InfoRecord.IA32HealthFlags; - } - if (BistData.Uint32 != 0) { - // - // Report Status Code that self test is failed - // - REPORT_STATUS_CODE ( - EFI_ERROR_CODE | EFI_ERROR_MAJOR, - (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_SELF_TEST) - ); + BistData = CpuInstance[CpuInstanceNumber].InfoRecord.IA32HealthFlags; } } + if (BistData.Uint32 != 0) { + // + // Report Status Code that self test is failed + // + REPORT_STATUS_CODE ( + EFI_ERROR_CODE | EFI_ERROR_MAJOR, + (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_SELF_TEST) + ); + } } } /** - Callback function for ExitBootServices. + Get GDT register value. + + This function is mainly for AP purpose because AP may have different GDT + table than BSP. + + @param[in,out] Buffer The pointer to private data buffer. + +**/ +VOID +EFIAPI +GetGdtr ( + IN OUT VOID *Buffer + ) +{ + AsmReadGdtr ((IA32_DESCRIPTOR *)Buffer); +} + +/** + Initializes CPU exceptions handlers for the sake of stack switch requirement. + + This function is a wrapper of InitializeCpuExceptionHandlersEx. It's mainly + for the sake of AP's init because of EFI_AP_PROCEDURE API requirement. - @param Event Event whose notification function is being invoked. - @param Context The pointer to the notification function's context, - which is implementation-dependent. + @param[in,out] Buffer The pointer to private data buffer. **/ VOID EFIAPI -ExitBootServicesCallback ( - IN EFI_EVENT Event, - IN VOID *Context +InitializeExceptionStackSwitchHandlers ( + IN OUT VOID *Buffer + ) +{ + CPU_EXCEPTION_INIT_DATA *EssData; + IA32_DESCRIPTOR Idtr; + EFI_STATUS Status; + + EssData = Buffer; + // + // We don't plan to replace IDT table with a new one, but we should not assume + // the AP's IDT is the same as BSP's IDT either. + // + AsmReadIdtr (&Idtr); + EssData->Ia32.IdtTable = (VOID *)Idtr.Base; + EssData->Ia32.IdtTableSize = Idtr.Limit + 1; + Status = InitializeCpuExceptionHandlersEx (NULL, EssData); + ASSERT_EFI_ERROR (Status); +} + +/** + Initializes MP exceptions handlers for the sake of stack switch requirement. + + This function will allocate required resources required to setup stack switch + and pass them through CPU_EXCEPTION_INIT_DATA to each logic processor. + +**/ +VOID +InitializeMpExceptionStackSwitchHandlers ( + VOID ) { + UINTN Index; + UINTN Bsp; + UINTN ExceptionNumber; + UINTN OldGdtSize; + UINTN NewGdtSize; + UINTN NewStackSize; + IA32_DESCRIPTOR Gdtr; + CPU_EXCEPTION_INIT_DATA EssData; + UINT8 *GdtBuffer; + UINT8 *StackTop; + + if (!PcdGetBool (PcdCpuStackGuard)) { + return; + } + + ExceptionNumber = FixedPcdGetSize (PcdCpuStackSwitchExceptionList); + NewStackSize = FixedPcdGet32 (PcdCpuKnownGoodStackSize) * ExceptionNumber; + + StackTop = AllocateRuntimeZeroPool (NewStackSize * mNumberOfProcessors); + ASSERT (StackTop != NULL); + StackTop += NewStackSize * mNumberOfProcessors; + // - // Avoid APs access invalid buff datas which allocated by BootServices, - // so we send INIT IPI to APs to let them wait for SIPI state. + // The default exception handlers must have been initialized. Let's just skip + // it in this method. // - SendInitIpiAllExcludingSelf (); + EssData.Ia32.Revision = CPU_EXCEPTION_INIT_DATA_REV; + EssData.Ia32.InitDefaultHandlers = FALSE; + + EssData.Ia32.StackSwitchExceptions = FixedPcdGetPtr(PcdCpuStackSwitchExceptionList); + EssData.Ia32.StackSwitchExceptionNumber = ExceptionNumber; + EssData.Ia32.KnownGoodStackSize = FixedPcdGet32(PcdCpuKnownGoodStackSize); + + MpInitLibWhoAmI (&Bsp); + for (Index = 0; Index < mNumberOfProcessors; ++Index) { + // + // To support stack switch, we need to re-construct GDT but not IDT. + // + if (Index == Bsp) { + GetGdtr (&Gdtr); + } else { + // + // AP might have different size of GDT from BSP. + // + MpInitLibStartupThisAP (GetGdtr, Index, NULL, 0, (VOID *)&Gdtr, NULL); + } + + // + // X64 needs only one TSS of current task working for all exceptions + // because of its IST feature. IA32 needs one TSS for each exception + // in addition to current task. Since AP is not supposed to allocate + // memory, we have to do it in BSP. To simplify the code, we allocate + // memory for IA32 case to cover both IA32 and X64 exception stack + // switch. + // + // Layout of memory to allocate for each processor: + // -------------------------------- + // | Alignment | (just in case) + // -------------------------------- + // | | + // | Original GDT | + // | | + // -------------------------------- + // | Current task descriptor | + // -------------------------------- + // | | + // | Exception task descriptors | X ExceptionNumber + // | | + // -------------------------------- + // | Current task-state segment | + // -------------------------------- + // | | + // | Exception task-state segment | X ExceptionNumber + // | | + // -------------------------------- + // + OldGdtSize = Gdtr.Limit + 1; + EssData.Ia32.ExceptionTssDescSize = sizeof (IA32_TSS_DESCRIPTOR) * + (ExceptionNumber + 1); + EssData.Ia32.ExceptionTssSize = sizeof (IA32_TASK_STATE_SEGMENT) * + (ExceptionNumber + 1); + NewGdtSize = sizeof (IA32_TSS_DESCRIPTOR) + + OldGdtSize + + EssData.Ia32.ExceptionTssDescSize + + EssData.Ia32.ExceptionTssSize; + + GdtBuffer = AllocateRuntimeZeroPool (NewGdtSize); + ASSERT (GdtBuffer != NULL); + + // + // Make sure GDT table alignment + // + EssData.Ia32.GdtTable = ALIGN_POINTER(GdtBuffer, sizeof (IA32_TSS_DESCRIPTOR)); + NewGdtSize -= ((UINT8 *)EssData.Ia32.GdtTable - GdtBuffer); + EssData.Ia32.GdtTableSize = NewGdtSize; + + EssData.Ia32.ExceptionTssDesc = ((UINT8 *)EssData.Ia32.GdtTable + OldGdtSize); + EssData.Ia32.ExceptionTss = ((UINT8 *)EssData.Ia32.GdtTable + OldGdtSize + + EssData.Ia32.ExceptionTssDescSize); + + EssData.Ia32.KnownGoodStackTop = (UINTN)StackTop; + DEBUG ((DEBUG_INFO, + "Exception stack top[cpu%lu]: 0x%lX\n", + (UINT64)(UINTN)Index, + (UINT64)(UINTN)StackTop)); + + if (Index == Bsp) { + InitializeExceptionStackSwitchHandlers (&EssData); + } else { + MpInitLibStartupThisAP ( + InitializeExceptionStackSwitchHandlers, + Index, + NULL, + 0, + (VOID *)&EssData, + NULL + ); + } + + StackTop -= NewStackSize; + } } /** @@ -1013,23 +798,20 @@ InitializeMpSupport ( UINTN NumberOfProcessors; UINTN NumberOfEnabledProcessors; - NumberOfProcessors = (UINTN) PcdGet32 (PcdCpuMaxLogicalProcessorNumber); - if (NumberOfProcessors < 1) { - DEBUG ((DEBUG_ERROR, "Setting PcdCpuMaxLogicalProcessorNumber should be more than zero.\n")); - return; - } - // - // Only perform AP detection if PcdCpuMaxLogicalProcessorNumber is greater than 1 + // Wakeup APs to do initialization // - if (NumberOfProcessors > 1) { - Status = MpInitLibInitialize (); - ASSERT_EFI_ERROR (Status); + Status = MpInitLibInitialize (); + ASSERT_EFI_ERROR (Status); - MpInitLibGetNumberOfProcessors (&NumberOfProcessors, &NumberOfEnabledProcessors); - mNumberOfProcessors = NumberOfProcessors; - } - DEBUG ((EFI_D_ERROR, "Detect CPU count: %d\n", mNumberOfProcessors)); + MpInitLibGetNumberOfProcessors (&NumberOfProcessors, &NumberOfEnabledProcessors); + mNumberOfProcessors = NumberOfProcessors; + DEBUG ((DEBUG_INFO, "Detect CPU count: %d\n", mNumberOfProcessors)); + + // + // Initialize exception stack switch handlers for each logic processor. + // + InitializeMpExceptionStackSwitchHandlers (); // // Update CPU healthy information from Guided HOB