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

UefiCpuPkg RegisterCpuFeaturesLib: Fix an ASSERTION issue 

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1968

We met assertion like below, it happens when there is only
one processor.

ASSERT_EFI_ERROR (Status = Not started)
ASSERT [CpuFeaturesDxe] X:\XXX\XXX\RegisterCpuFeaturesLib\
  DxeRegisterCpuFeaturesLib.c(149): !EFI_ERROR (Status)

The code should not call StartupAllAPs when there is only one processor.

Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Chandana Kumar <chandana.c.kumar@intel.com>
Cc: Kevin Li <kevin.y.li@intel.com>
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Star Zeng 2019-07-10 19:40:05 +08:00
parent 28781fd52a
commit 7a0df266e5
3 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c
View File

@ -1071,10 +1071,12 @@ CpuFeaturesDetect (
CpuInitDataInitialize ();
//
// Wakeup all APs for data collection.
//
StartupAPsWorker (CollectProcessorData, NULL);
if (CpuFeaturesData->NumberOfCpus > 1) {
//
// Wakeup all APs for data collection.
//
StartupAPsWorker (CollectProcessorData, NULL);
}
//
// Collect data on BSP

43
UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c
View File

@ -229,31 +229,36 @@ CpuFeaturesInitialize (
OldBspNumber = GetProcessorIndex (CpuFeaturesData);
CpuFeaturesData->BspNumber = OldBspNumber;
Status = gBS->CreateEvent (
EVT_NOTIFY_WAIT,
TPL_CALLBACK,
EfiEventEmptyFunction,
NULL,
&MpEvent
);
ASSERT_EFI_ERROR (Status);
if (CpuFeaturesData->NumberOfCpus > 1) {
Status = gBS->CreateEvent (
EVT_NOTIFY_WAIT,
TPL_CALLBACK,
EfiEventEmptyFunction,
NULL,
&MpEvent
);
ASSERT_EFI_ERROR (Status);
//
// Wakeup all APs for programming.
//
StartupAPsWorker (SetProcessorRegister, MpEvent);
}
//
// Wakeup all APs for programming.
//
StartupAPsWorker (SetProcessorRegister, MpEvent);
//
// Programming BSP
//
SetProcessorRegister (CpuFeaturesData);
//
// Wait all processors to finish the task.
//
do {
Status = gBS->CheckEvent (MpEvent);
} while (Status == EFI_NOT_READY);
ASSERT_EFI_ERROR (Status);
if (CpuFeaturesData->NumberOfCpus > 1) {
//
// Wait all processors to finish the task.
//
do {
Status = gBS->CheckEvent (MpEvent);
} while (Status == EFI_NOT_READY);
ASSERT_EFI_ERROR (Status);
}
//
// Switch to new BSP if required

11
UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c
View File

@ -273,10 +273,13 @@ CpuFeaturesInitialize (
// DXE type instance.
//
//
// Wakeup all APs for programming.
//
StartupAPsWorker (SetProcessorRegister, NULL);
if (CpuFeaturesData->NumberOfCpus > 1) {
//
// Wakeup all APs for programming.
//
StartupAPsWorker (SetProcessorRegister, NULL);
}
//
// Programming BSP
//