diff options
Diffstat (limited to 'UefiCpuPkg/CpuDxe/CpuMp.c')
| -rw-r--r-- | UefiCpuPkg/CpuDxe/CpuMp.c | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/UefiCpuPkg/CpuDxe/CpuMp.c index 029e8d4331..13fcda5859 100644 --- a/UefiCpuPkg/CpuDxe/CpuMp.c +++ b/UefiCpuPkg/CpuDxe/CpuMp.c @@ -25,6 +25,7 @@ VOID *mCommonStack = 0; VOID *mTopOfApCommonStack = 0;
VOID *mApStackStart = 0;
+BOOLEAN mAPsAlreadyInitFinished = FALSE;
volatile BOOLEAN mStopCheckAllAPsStatus = TRUE;
EFI_MP_SERVICES_PROTOCOL mMpServicesTemplate = {
@@ -1112,6 +1113,7 @@ ResetProcessorToIdleState ( IN CPU_DATA_BLOCK *CpuData
)
{
+ ResetApStackless ((UINT32)CpuData->Info.ProcessorId);
}
/**
@@ -1138,6 +1140,14 @@ ProcessorToIdleState ( AsmApDoneWithCommonStack ();
+ //
+ // Avoid forcibly reset AP caused the AP State is not updated.
+ //
+ GetMpSpinLock (CpuData);
+ CpuData->State = CpuStateIdle;
+ CpuData->Procedure = NULL;
+ ReleaseMpSpinLock (CpuData);
+
while (TRUE) {
GetMpSpinLock (CpuData);
ProcedureArgument = CpuData->Parameter;
@@ -1319,13 +1329,27 @@ ApEntryPointInC ( VOID
)
{
- VOID* TopOfApStack;
+ VOID* TopOfApStack;
+ UINTN ProcessorNumber;
- FillInProcessorInformation (FALSE, mMpSystemData.NumberOfProcessors);
- TopOfApStack = (UINT8*)mApStackStart + gApStackSize;
- mApStackStart = TopOfApStack;
+ if (!mAPsAlreadyInitFinished) {
+ FillInProcessorInformation (FALSE, mMpSystemData.NumberOfProcessors);
+ TopOfApStack = (UINT8*)mApStackStart + gApStackSize;
+ mApStackStart = TopOfApStack;
- mMpSystemData.NumberOfProcessors++;
+ //
+ // Store the Stack address, when reset the AP, We can found the original address.
+ //
+ mMpSystemData.CpuDatas[mMpSystemData.NumberOfProcessors].TopOfStack = TopOfApStack;
+ mMpSystemData.NumberOfProcessors++;
+ mMpSystemData.NumberOfEnabledProcessors++;
+ } else {
+ WhoAmI (&mMpServicesTemplate, &ProcessorNumber);
+ //
+ // Get the original stack address.
+ //
+ TopOfApStack = mMpSystemData.CpuDatas[ProcessorNumber].TopOfStack;
+ }
SwitchStack (
(SWITCH_STACK_ENTRY_POINT)(UINTN)ProcessorToIdleState,
@@ -1462,6 +1486,8 @@ InitializeMpSupport ( return;
}
+ mAPsAlreadyInitFinished = TRUE;
+
if (mMpSystemData.NumberOfProcessors < gMaxLogicalProcessorNumber) {
FreePages (mApStackStart, EFI_SIZE_TO_PAGES (
(gMaxLogicalProcessorNumber - mMpSystemData.NumberOfProcessors) *
|