tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UefiCpuPkg/MpService: move settimer out to InitMpSystemData 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16362 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Chen Fan 2014-11-13 18:28:20 +00:00 committed by jljusten
parent 9908a829d0
commit acb2172d15
1 changed files with 79 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
UefiCpuPkg/CpuDxe/CpuMp.c
View File

@ -25,6 +25,8 @@ VOID *mCommonStack = 0;
VOID *mTopOfApCommonStack = 0; VOID *mTopOfApCommonStack = 0;
VOID *mApStackStart = 0; VOID *mApStackStart = 0;
volatile BOOLEAN mStopCheckAllAPsStatus = TRUE;
EFI_MP_SERVICES_PROTOCOL mMpServicesTemplate = { EFI_MP_SERVICES_PROTOCOL mMpServicesTemplate = {
GetNumberOfProcessors, GetNumberOfProcessors,
GetProcessorInfo, GetProcessorInfo,
@ -637,6 +639,11 @@ StartupAllAPs (
} }
} }
//
// temporarily stop checkAllAPsStatus for initialize parameters.
//
mStopCheckAllAPsStatus = TRUE;
mMpSystemData.Procedure = Procedure; mMpSystemData.Procedure = Procedure;
mMpSystemData.ProcedureArgument = ProcedureArgument; mMpSystemData.ProcedureArgument = ProcedureArgument;
mMpSystemData.WaitEvent = WaitEvent; mMpSystemData.WaitEvent = WaitEvent;
@ -686,13 +693,13 @@ StartupAllAPs (
} }
} }
mStopCheckAllAPsStatus = FALSE;
if (WaitEvent != NULL) { if (WaitEvent != NULL) {
Status = gBS->SetTimer ( //
mMpSystemData.CheckAllAPsEvent, // non blocking
TimerPeriodic, //
EFI_TIMER_PERIOD_MICROSECONDS (100) return EFI_SUCCESS;
);
return Status;
} }
while (TRUE) { while (TRUE) {
@ -819,7 +826,6 @@ StartupThisAP (
) )
{ {
CPU_DATA_BLOCK *CpuData; CPU_DATA_BLOCK *CpuData;
EFI_STATUS Status;
CpuData = NULL; CpuData = NULL;
@ -849,6 +855,11 @@ StartupThisAP (
return EFI_NOT_READY; return EFI_NOT_READY;
} }
//
// temporarily stop checkAllAPsStatus for initialize parameters.
//
mStopCheckAllAPsStatus = TRUE;
SetApState (CpuData, CpuStateReady); SetApState (CpuData, CpuStateReady);
SetApProcedure (CpuData, Procedure, ProcedureArgument); SetApProcedure (CpuData, Procedure, ProcedureArgument);
@ -858,16 +869,13 @@ StartupThisAP (
CpuData->TimeoutActive = !!(TimeoutInMicroseconds); CpuData->TimeoutActive = !!(TimeoutInMicroseconds);
CpuData->Finished = Finished; CpuData->Finished = Finished;
mStopCheckAllAPsStatus = FALSE;
if (WaitEvent != NULL) { if (WaitEvent != NULL) {
// //
// Non Blocking // Non Blocking
// //
Status = gBS->SetTimer ( return EFI_SUCCESS;
CpuData->CheckThisAPEvent,
TimerPeriodic,
EFI_TIMER_PERIOD_MICROSECONDS (100)
);
return Status;
} }
// //
@ -1194,11 +1202,9 @@ CheckThisAPStatus (
return; return;
out: out:
gBS->SetTimer (CpuData->CheckThisAPEvent, TimerCancel, 0); CpuData->TimeoutActive = FALSE;
if (CpuData->WaitEvent) { gBS->SignalEvent (CpuData->WaitEvent);
gBS->SignalEvent (CpuData->WaitEvent); CpuData->WaitEvent = NULL;
CpuData->WaitEvent = NULL;
}
} }
/** /**
@ -1218,36 +1224,62 @@ CheckAllAPsStatus (
IN VOID *Context IN VOID *Context
) )
{ {
CPU_DATA_BLOCK *CpuData;
UINTN Number;
if (mMpSystemData.TimeoutActive) { if (mMpSystemData.TimeoutActive) {
mMpSystemData.Timeout -= gPollInterval; mMpSystemData.Timeout -= gPollInterval;
} }
CheckAndUpdateAllAPsToIdleState (); if (mStopCheckAllAPsStatus) {
//
// task timeout
//
if (mMpSystemData.TimeoutActive && mMpSystemData.Timeout < 0) {
ResetAllFailedAPs();
//
// force exit
//
mMpSystemData.FinishCount = mMpSystemData.StartCount;
}
if (mMpSystemData.FinishCount != mMpSystemData.StartCount) {
return; return;
} }
gBS->SetTimer ( if (mMpSystemData.WaitEvent != NULL) {
mMpSystemData.CheckAllAPsEvent, CheckAndUpdateAllAPsToIdleState ();
TimerCancel, //
0 // task timeout
); //
if (mMpSystemData.TimeoutActive && mMpSystemData.Timeout < 0) {
ResetAllFailedAPs();
//
// force exit
//
mMpSystemData.FinishCount = mMpSystemData.StartCount;
}
if (mMpSystemData.WaitEvent) { if (mMpSystemData.FinishCount != mMpSystemData.StartCount) {
return;
}
mMpSystemData.TimeoutActive = FALSE;
gBS->SignalEvent (mMpSystemData.WaitEvent); gBS->SignalEvent (mMpSystemData.WaitEvent);
mMpSystemData.WaitEvent = NULL; mMpSystemData.WaitEvent = NULL;
mStopCheckAllAPsStatus = TRUE;
}
//
// check each AP status for StartupThisAP
//
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;
}
if (CpuData->WaitEvent) {
CheckThisAPStatus (NULL, (VOID *)CpuData);
}
} }
} }
@ -1324,8 +1356,6 @@ InitMpSystemData (
VOID VOID
) )
{ {
UINTN ProcessorNumber;
CPU_DATA_BLOCK *CpuData;
EFI_STATUS Status; EFI_STATUS Status;
ZeroMem (&mMpSystemData, sizeof (MP_SYSTEM_DATA)); ZeroMem (&mMpSystemData, sizeof (MP_SYSTEM_DATA));
@ -1345,17 +1375,15 @@ InitMpSystemData (
); );
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
for (ProcessorNumber = 0; ProcessorNumber < gMaxLogicalProcessorNumber; ProcessorNumber++) { //
CpuData = &mMpSystemData.CpuDatas[ProcessorNumber]; // Set timer to check all APs status.
Status = gBS->CreateEvent ( //
EVT_TIMER | EVT_NOTIFY_SIGNAL, Status = gBS->SetTimer (
TPL_CALLBACK, mMpSystemData.CheckAllAPsEvent,
CheckThisAPStatus, TimerPeriodic,
(VOID *) CpuData, EFI_TIMER_PERIOD_MICROSECONDS (100)
&CpuData->CheckThisAPEvent );
); ASSERT_EFI_ERROR (Status);
ASSERT_EFI_ERROR (Status);
}
// //
// BSP // BSP