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

UefiCpuPkg/MpInitLib: Check APIC mode change around AP function 

If APIC ID values are changed during AP functions execution, we need to update
new APIC ID values in local data structure accordingly.

But if APIC mode change happened during AP function execution, we do not support
APIC ID value changed.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Jeff Fan 2017-05-24 13:53:30 +08:00
parent 6661abb695
commit c6b0feb396
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
UefiCpuPkg/Library/MpInitLib/MpLib.c
View File

@ -547,6 +547,7 @@ ApWakeupFunction (
volatile UINT32 *ApStartupSignalBuffer;
CPU_INFO_IN_HOB *CpuInfoInHob;
UINT64 ApTopOfStack;
UINTN CurrentApicMode;
//
// AP finished assembly code and begin to execute C code
@ -560,6 +561,7 @@ ApWakeupFunction (
ProgramVirtualWireMode ();
SyncLocalApicTimerSetting (CpuMpData);
CurrentApicMode = GetApicMode ();
while (TRUE) {
if (CpuMpData->InitFlag == ApInitConfig) {
//
@ -627,11 +629,23 @@ ApWakeupFunction (
ApStartupSignalBuffer = CpuMpData->CpuData[ProcessorNumber].StartupApSignal;
CpuInfoInHob[ProcessorNumber].ApTopOfStack = CpuInfoInHob[CpuMpData->NewBspNumber].ApTopOfStack;
} else {
//
// Re-get the CPU APICID and Initial APICID
//
CpuInfoInHob[ProcessorNumber].ApicId = GetApicId ();
CpuInfoInHob[ProcessorNumber].InitialApicId = GetInitialApicId ();
if (CpuInfoInHob[ProcessorNumber].ApicId != GetApicId () ||
CpuInfoInHob[ProcessorNumber].InitialApicId != GetInitialApicId ()) {
if (CurrentApicMode != GetApicMode ()) {
//
// If APIC mode change happened during AP function execution,
// we do not support APIC ID value changed.
//
ASSERT (FALSE);
CpuDeadLoop ();
} else {
//
// Re-get the CPU APICID and Initial APICID if they are changed
//
CpuInfoInHob[ProcessorNumber].ApicId = GetApicId ();
CpuInfoInHob[ProcessorNumber].InitialApicId = GetInitialApicId ();
}
}
}
}
SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateFinished);