diff options
| author | Jiaxin Wu <jiaxin.wu@intel.com> | 2024-07-08 11:23:09 +0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2024-08-28 15:25:27 +0000 |
| commit | ae0d54cd4362b1a2788226a2fecf4cff6bfb453d (patch) | |
| tree | 1560133afc18d37e5967adfe135f99131f88da8f /UefiCpuPkg | |
| parent | 1816c78f43f5d2d309a2a2d91bf5e7412bab19b5 (diff) | |
| download | edk2-ae0d54cd4362b1a2788226a2fecf4cff6bfb453d.tar.gz | |
UefiCpuPkg/PiSmmCpuDxeSmm: Cleanup SMM_CPU_SYNC_MODE
Use MM_CPU_SYNC_MODE instead of SMM_CPU_SYNC_MODE.
Cleanup the duplicate definition.
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Dun Tan <dun.tan@intel.com>
Cc: Hongbin1 Zhang <hongbin1.zhang@intel.com>
Cc: Wei6 Xu <wei6.xu@intel.com>
Cc: Yuanhao Xie <yuanhao.xie@intel.com>
Diffstat (limited to 'UefiCpuPkg')
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c | 2 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c | 22 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.h | 28 | ||||
| -rw-r--r-- | UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c | 2 |
4 files changed, 24 insertions, 30 deletions
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c index 8a1c6ff8d7..72ffb5a50d 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c @@ -431,7 +431,7 @@ SmmCpuRendezvous ( goto ON_EXIT;
}
- if ((mSmmMpSyncData->EffectiveSyncMode != SmmCpuSyncModeTradition) && !SmmCpuFeaturesNeedConfigureMtrrs ()) {
+ if ((mSmmMpSyncData->EffectiveSyncMode != MmCpuSyncModeTradition) && !SmmCpuFeaturesNeedConfigureMtrrs ()) {
//
// There are some APs outside SMM, Wait for all avaiable APs to arrive.
//
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c index aae283e79b..819b35a35d 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c @@ -20,7 +20,7 @@ UINTN mSmmMpSyncDataSize; SMM_CPU_SEMAPHORES mSmmCpuSemaphores;
UINTN mSemaphoreSize;
SPIN_LOCK *mPFLock = NULL;
-SMM_CPU_SYNC_MODE mCpuSmmSyncMode;
+MM_CPU_SYNC_MODE mCpuSmmSyncMode;
BOOLEAN mMachineCheckSupported = FALSE;
MM_COMPLETION mSmmStartupThisApToken;
@@ -454,8 +454,8 @@ ResetTokens ( **/
VOID
BSPHandler (
- IN UINTN CpuIndex,
- IN SMM_CPU_SYNC_MODE SyncMode
+ IN UINTN CpuIndex,
+ IN MM_CPU_SYNC_MODE SyncMode
)
{
UINTN CpuCount;
@@ -504,7 +504,7 @@ BSPHandler ( //
// If Traditional Sync Mode or need to configure MTRRs: gather all available APs.
//
- if ((SyncMode == SmmCpuSyncModeTradition) || SmmCpuFeaturesNeedConfigureMtrrs ()) {
+ if ((SyncMode == MmCpuSyncModeTradition) || SmmCpuFeaturesNeedConfigureMtrrs ()) {
//
// Wait for APs to arrive
//
@@ -594,7 +594,7 @@ BSPHandler ( // make those APs to exit SMI synchronously. APs which arrive later will be excluded and
// will run through freely.
//
- if ((SyncMode != SmmCpuSyncModeTradition) && !SmmCpuFeaturesNeedConfigureMtrrs ()) {
+ if ((SyncMode != MmCpuSyncModeTradition) && !SmmCpuFeaturesNeedConfigureMtrrs ()) {
//
// Lock door for late coming CPU checkin and retrieve the Arrived number of APs
//
@@ -722,9 +722,9 @@ BSPHandler ( **/
VOID
APHandler (
- IN UINTN CpuIndex,
- IN BOOLEAN ValidSmi,
- IN SMM_CPU_SYNC_MODE SyncMode
+ IN UINTN CpuIndex,
+ IN BOOLEAN ValidSmi,
+ IN MM_CPU_SYNC_MODE SyncMode
)
{
UINT64 Timer;
@@ -801,7 +801,7 @@ APHandler ( //
*(mSmmMpSyncData->CpuData[CpuIndex].Present) = TRUE;
- if ((SyncMode == SmmCpuSyncModeTradition) || SmmCpuFeaturesNeedConfigureMtrrs ()) {
+ if ((SyncMode == MmCpuSyncModeTradition) || SmmCpuFeaturesNeedConfigureMtrrs ()) {
//
// Notify BSP of arrival at this point
//
@@ -1131,7 +1131,7 @@ InternalSmmStartupThisAp ( }
if (!(*(mSmmMpSyncData->CpuData[CpuIndex].Present))) {
- if (mSmmMpSyncData->EffectiveSyncMode == SmmCpuSyncModeTradition) {
+ if (mSmmMpSyncData->EffectiveSyncMode == MmCpuSyncModeTradition) {
DEBUG ((DEBUG_ERROR, "!mSmmMpSyncData->CpuData[%d].Present\n", CpuIndex));
}
@@ -1947,7 +1947,7 @@ InitializeMpServiceData ( RelaxedMode = FALSE;
GetSmmCpuSyncConfigData (&RelaxedMode, NULL, NULL);
- mCpuSmmSyncMode = RelaxedMode ? SmmCpuSyncModeRelaxedAp : SmmCpuSyncModeTradition;
+ mCpuSmmSyncMode = RelaxedMode ? MmCpuSyncModeRelaxedAp : MmCpuSyncModeTradition;
InitializeMpSyncData ();
//
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.h b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.h index ec3f32e381..d7a645fb5b 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.h +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.h @@ -401,28 +401,22 @@ typedef struct { EFI_STATUS *Status;
} SMM_CPU_DATA_BLOCK;
-typedef enum {
- SmmCpuSyncModeTradition,
- SmmCpuSyncModeRelaxedAp,
- SmmCpuSyncModeMax
-} SMM_CPU_SYNC_MODE;
-
typedef struct {
//
// Pointer to an array. The array should be located immediately after this structure
// so that UC cache-ability can be set together.
//
- SMM_CPU_DATA_BLOCK *CpuData;
- volatile UINT32 BspIndex;
- volatile BOOLEAN *InsideSmm;
- volatile BOOLEAN *AllCpusInSync;
- volatile SMM_CPU_SYNC_MODE EffectiveSyncMode;
- volatile BOOLEAN SwitchBsp;
- volatile BOOLEAN *CandidateBsp;
- volatile BOOLEAN AllApArrivedWithException;
- EFI_AP_PROCEDURE StartupProcedure;
- VOID *StartupProcArgs;
- SMM_CPU_SYNC_CONTEXT *SyncContext;
+ SMM_CPU_DATA_BLOCK *CpuData;
+ volatile UINT32 BspIndex;
+ volatile BOOLEAN *InsideSmm;
+ volatile BOOLEAN *AllCpusInSync;
+ volatile MM_CPU_SYNC_MODE EffectiveSyncMode;
+ volatile BOOLEAN SwitchBsp;
+ volatile BOOLEAN *CandidateBsp;
+ volatile BOOLEAN AllApArrivedWithException;
+ EFI_AP_PROCEDURE StartupProcedure;
+ VOID *StartupProcArgs;
+ SMM_CPU_SYNC_CONTEXT *SyncContext;
} SMM_DISPATCHER_MP_SYNC_DATA;
#define SMM_PSD_OFFSET 0xfb00
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c index 579f5bd985..f544858c19 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c @@ -193,7 +193,7 @@ GetSmmCpuSyncConfigData ( )
{
if (RelaxedMode != NULL) {
- *RelaxedMode = (BOOLEAN)(PcdGet8 (PcdCpuSmmSyncMode) == SmmCpuSyncModeRelaxedAp);
+ *RelaxedMode = (BOOLEAN)(PcdGet8 (PcdCpuSmmSyncMode) == MmCpuSyncModeRelaxedAp);
}
if (SyncTimeout != NULL) {
|