Reviewed-by: Eric Dong <eric.d...@intel.com> > -----Original Message----- > From: Zeng, Star > Sent: Wednesday, July 10, 2019 7:43 PM > To: devel@edk2.groups.io > Cc: Zeng, Star <star.z...@intel.com>; Laszlo Ersek <ler...@redhat.com>; > Dong, Eric <eric.d...@intel.com>; Ni, Ray <ray...@intel.com>; Kumar, > Chandana C <chandana.c.ku...@intel.com>; Li, Kevin Y > <kevin.y...@intel.com> > Subject: [PATCH] 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 <ler...@redhat.com> > Cc: Eric Dong <eric.d...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Chandana Kumar <chandana.c.ku...@intel.com> > Cc: Kevin Li <kevin.y...@intel.com> > Signed-off-by: Star Zeng <star.z...@intel.com> > --- > .../CpuFeaturesInitialize.c | 10 +++-- > .../DxeRegisterCpuFeaturesLib.c | 43 +++++++++++-------- > .../PeiRegisterCpuFeaturesLib.c | 11 +++-- > 3 files changed, 37 insertions(+), 27 deletions(-) > > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > index aff7ad600cad..1746f4f07f7b 100644 > --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/CpuFeaturesInitialize.c > @@ -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 > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c > index 9c78a2d993c4..ffd99046a6cd 100644 > --- > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLib.c > +++ > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/DxeRegisterCpuFeaturesLi > +++ b.c > @@ -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 > diff --git > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c > index 2b1553f9b84b..8ad5a40e5a44 100644 > --- > a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c > +++ > b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLi > +++ b.c > @@ -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 > // > -- > 2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43546): https://edk2.groups.io/g/devel/message/43546 Mute This Topic: https://groups.io/mt/32415229/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-