sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UefiCpuPkg/CpuDxe: introduce ResetApStackless()

Browse Source 
If timeout expires before AP returns from Procedure, the AP should
be terminated, we introduce ResetApStackLess() to send init IPI
to let AP exit Procedurce and re-available.

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@16366 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Chen Fan
2014-11-13 18:29:13 +00:00
committed by jljusten
parent fe078dd57f
commit ac9dbb3b03
3 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
UefiCpuPkg/CpuDxe/CpuMp.c
View File

@@ -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) *