Reviewed-by: Ray Ni <ray...@intel.com> > -----Original Message----- > From: Li, Zhihao <zhihao...@intel.com> > Sent: Wednesday, May 10, 2023 4:38 PM > To: devel@edk2.groups.io > Cc: Dong, Eric <eric.d...@intel.com>; Ni, Ray <ray...@intel.com> > Subject: [PATCH v1 1/1] UefiCpuPkg/CpuService.c:check cpu sync mode in > SmmCpuRendezvous() > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4431 > > In Ap relaxed mode, some SMI handlers should call SmmWaitForApArrival() to let > all ap arrive in SmmCpuRendezvous(). But in traditional mode, these SMI > handlers don't need to call SmmWaitForApArrival() again. So it need to be > check > cpu sync mode before calling SmmWaitForApArrival(). > > Cc: Eric Dong <eric.d...@intel.com> > Cc: Ray Ni <ray...@intel.com> > > Signed-off-by: Zhihao Li <zhihao...@intel.com> > --- > UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > index 2ebf4543c3ed..391b64e9f222 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c > @@ -1,7 +1,7 @@ > /** @file > > Implementation of SMM CPU Services Protocol. > > > > -Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.<BR> > > +Copyright (c) 2011 - 2023, Intel Corporation. All rights reserved.<BR> > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > **/ > > @@ -421,11 +421,18 @@ SmmCpuRendezvous ( > goto ON_EXIT; > > } > > > > - // > > - // There are some APs outside SMM, Wait for all avaiable APs to arrive. > > - // > > - SmmWaitForApArrival (); > > - Status = mSmmMpSyncData->AllApArrivedWithException ? EFI_SUCCESS : > EFI_TIMEOUT; > > + if ((mSmmMpSyncData->EffectiveSyncMode != SmmCpuSyncModeTradition) > && !SmmCpuFeaturesNeedConfigureMtrrs ()) { > > + // > > + // There are some APs outside SMM, Wait for all avaiable APs to arrive. > > + // > > + SmmWaitForApArrival (); > > + Status = mSmmMpSyncData->AllApArrivedWithException ? EFI_SUCCESS : > EFI_TIMEOUT; > > + } else { > > + // > > + // BSP has already waitted for APs to arrive SMM if SmmCpuSyncMode > selected or need config MTRR. > > + // > > + Status = EFI_TIMEOUT; > > + } > > > > ON_EXIT: > > if (!mSmmMpSyncData->AllApArrivedWithException) { > > -- > 2.26.2.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104521): https://edk2.groups.io/g/devel/message/104521 Mute This Topic: https://groups.io/mt/98801800/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
