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

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.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>

Signed-off-by: Zhihao Li <zhihao.li@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Zhihao Li 2023-05-10 10:45:35 +08:00 committed by mergify[bot]
parent d15d2667d5
commit 5bb7bfbe81
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
View File

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