UefiCpuPkg/PiSmmCpuDxeSmm: Rename PiSmmCpuDxeSmm.h to PiSmmCpuCommon.h

Rename the file PiSmmCpuDxeSmm.h to PiSmmCpuCommon.h to facilitate
common usage in both SMM and MM. The renamed file PiSmmCpuCommon.h
will be utilized for both modes in subsequent patches.

No function impact.

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>

18 files changed, 20 insertions, 20 deletions

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
index 4c6f31c..cb77c3b 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
@@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 #include <PiPei.h>

 

 BOOLEAN  mRestoreSmmConfigurationInS3 = FALSE;

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
index 3d1ea99..8a1c6ff 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuService.c
@@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 //

 // SMM CPU Service Protocol instance

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
index dfc9668..2fc55ea 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 /**

   Create PageTable for SMM use.

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmFuncsArch.c b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmFuncsArch.c
index 0c1cc51..2bcbd33 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmFuncsArch.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmFuncsArch.c
@@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 extern UINT64  gTaskGateDescriptor;

 

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c
index b279c8a..b522a50 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmProfileArch.c
@@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 #include "SmmProfileInternal.h"

 

 /**

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
index 570e991..dbcc527 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/MpService.c
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 //

 // Slots for all MTRR( FIXED MTRR + VARIABLE MTRR + MTRR_LIB_IA32_MTRR_DEF_TYPE)

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.h
index 9d4775a..9d4775a 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuCommon.h
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
index 71ff40b..7f3b2bc 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 //

 // SMM CPU Private Data structure that contains SMM Configuration Protocol

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
index 886a616..e449880 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
@@ -30,7 +30,7 @@
 

 [Sources]

   PiSmmCpuDxeSmm.c

-  PiSmmCpuDxeSmm.h

+  PiSmmCpuCommon.h

   MpService.c

   SyncTimer.c

   CpuS3.c

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
index a66dd4a..4a1bab6 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
@@ -5,7 +5,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 //

 // attributes for reserved memory before it is promoted to system memory

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmMp.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmMp.c
index 6cc5f01..f839d1a 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmMp.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmMp.c
@@ -1,13 +1,13 @@
 /** @file

 SMM MP protocol implementation

 

-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2019 - 2024, Intel Corporation. All rights reserved.<BR>

 

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 #include "SmmMp.h"

 

 ///

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmMpPerf.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmMpPerf.c
index 6d5d2b2..723d0da 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmMpPerf.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmMpPerf.c
@@ -1,13 +1,13 @@
 /** @file

 SMM MP perf-logging implementation

 

-Copyright (c) 2023, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2023 - 2024, Intel Corporation. All rights reserved.<BR>

 

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 #define  SMM_MP_PERF_PROCEDURE_NAME(procedure)  # procedure

 GLOBAL_REMOVE_IF_UNREFERENCED

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
index bdfe05f..a0ebaf5 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 #include "SmmProfileInternal.h"

 

 UINT32  mSmmProfileCr3;

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
index b9a62ae..12fdf74 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmramSaveState.c
@@ -1,7 +1,7 @@
 /** @file

 Provides services to access SMRAM Save State Map

 

-Copyright (c) 2010 - 2019, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2024, Intel Corporation. All rights reserved.<BR>

 Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved.<BR>

 

 SPDX-License-Identifier: BSD-2-Clause-Patent

@@ -17,7 +17,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/SmmServicesTableLib.h>

 #include <Library/DebugLib.h>

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 typedef struct {

   UINT64    Signature;                                      // Offset 0x00

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c
index 8d29ba7..ad15313 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SyncTimer.c
@@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 UINT64  mTimeoutTicker = 0;

 

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
index abaa334..a5253e8 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 #define PAGE_TABLE_PAGES  8

 #define ACC_MAX_BIT       BIT3

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c
index ca706ee..1be2de4 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c
@@ -6,7 +6,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 

 EFI_PHYSICAL_ADDRESS  mGdtBuffer;

 UINTN                 mGdtBufferSize;

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
index a95653d..be9cd89 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmProfileArch.c
@@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-#include "PiSmmCpuDxeSmm.h"

+#include "PiSmmCpuCommon.h"

 #include "SmmProfileInternal.h"

 

 //