UefiCpuPkg/SmmRelocationLib: Remove unnecessary CpuIndex

This patch is to remove unnecessary CpuIndex.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Zeng Star <star.zeng@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

5 files changed, 3 insertions, 23 deletions

diff --git a/UefiCpuPkg/Library/SmmRelocationLib/Ia32/Semaphore.c b/UefiCpuPkg/Library/SmmRelocationLib/Ia32/Semaphore.c
index ba329d6ba2..5d9eea3de9 100644
--- a/UefiCpuPkg/Library/SmmRelocationLib/Ia32/Semaphore.c
+++ b/UefiCpuPkg/Library/SmmRelocationLib/Ia32/Semaphore.c
@@ -17,14 +17,12 @@ volatile BOOLEAN  *mRebasedFlag;
   can be executed immediately after AP exits SMM to indicate to

   the BSP that an AP has exited SMM after SMBASE relocation.

 

-  @param[in] CpuIndex     The processor index.

   @param[in] RebasedFlag  A pointer to a flag that is set to TRUE

                           immediately after AP exits SMM.

 

 **/

 VOID

 SemaphoreHook (

-  IN UINTN             CpuIndex,

   IN volatile BOOLEAN  *RebasedFlag

   )

 {

@@ -34,7 +32,6 @@ SemaphoreHook (
 

   CpuState                      = (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET);

   mSmmRelocationOriginalAddress = (UINTN)HookReturnFromSmm (

-                                           CpuIndex,

                                            CpuState,

                                            (UINT64)(UINTN)&SmmRelocationSemaphoreComplete,

                                            (UINT64)(UINTN)&SmmRelocationSemaphoreComplete

diff --git a/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h b/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h
index ede61b956f..d1387f2dfb 100644
--- a/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h
+++ b/UefiCpuPkg/Library/SmmRelocationLib/InternalSmmRelocationLib.h
@@ -83,8 +83,6 @@ SmmRelocationSemaphoreComplete (
   detected, and the appropriate hook must be selected.  Always clear the auto

   HALT restart flag if it is set.

 

-  @param[in]     CpuIndex                 The processor index for the currently

-                                          executing CPU.

   @param[in,out] CpuState                 Pointer to SMRAM Save State Map for the

                                           currently executing CPU.

   @param[in]     NewInstructionPointer32  Instruction pointer to use if resuming to

@@ -98,7 +96,6 @@ SmmRelocationSemaphoreComplete (
 UINT64

 EFIAPI

 HookReturnFromSmm (

-  IN     UINTN                 CpuIndex,

   IN OUT SMRAM_SAVE_STATE_MAP  *CpuState,

   IN     UINT64                NewInstructionPointer32,

   IN     UINT64                NewInstructionPointer

@@ -109,14 +106,12 @@ HookReturnFromSmm (
   can be executed immediately after AP exits SMM to indicate to

   the BSP that an AP has exited SMM after SMBASE relocation.

 

-  @param[in] CpuIndex     The processor index.

   @param[in] RebasedFlag  A pointer to a flag that is set to TRUE

                           immediately after AP exits SMM.

 

 **/

 VOID

 SemaphoreHook (

-  IN UINTN             CpuIndex,

   IN volatile BOOLEAN  *RebasedFlag

   );

 

diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c b/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c
index 86df66a280..7e65bbf929 100644
--- a/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c
+++ b/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c
@@ -31,11 +31,6 @@ UINT64  mSmBase;
 //

 volatile BOOLEAN  mRebased;

 

-//

-// CpuIndex for current CPU

-//

-UINTN  mCpuIndex;

-

 /**

   This function will get the SmBase for CpuIndex.

 

@@ -155,7 +150,7 @@ SmmInitHandler (
   // SMM re-based flag can't be set before RSM, because SMM save state context might be override

   // by next AP flow before it take effect.

   //

-  SemaphoreHook (mCpuIndex, &mRebased);

+  SemaphoreHook (&mRebased);

 }

 

 /**

@@ -227,9 +222,8 @@ SmmRelocateBases (
     ASSERT_EFI_ERROR (Status);

 

     if (BspApicId != (UINT32)ProcessorInfo.ProcessorId) {

-      mRebased  = FALSE;

-      mSmBase   = GetSmBase (Index, SmmRelocationStart, TileSize);

-      mCpuIndex = Index;

+      mRebased = FALSE;

+      mSmBase  = GetSmBase (Index, SmmRelocationStart, TileSize);

       SendSmiIpi ((UINT32)ProcessorInfo.ProcessorId);

       //

       // Wait for this AP to finish its 1st SMI

diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c b/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c
index d3a0bb9b89..76d798aba5 100644
--- a/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c
+++ b/UefiCpuPkg/Library/SmmRelocationLib/SmramSaveStateConfig.c
@@ -84,8 +84,6 @@ ConfigureSmBase (
   detected, and the appropriate hook must be selected.  Always clear the auto

   HALT restart flag if it is set.

 

-  @param[in]     CpuIndex                 The processor index for the currently

-                                          executing CPU.

   @param[in,out] CpuState                 Pointer to SMRAM Save State Map for the

                                           currently executing CPU.

   @param[in]     NewInstructionPointer32  Instruction pointer to use if resuming to

@@ -99,7 +97,6 @@ ConfigureSmBase (
 UINT64

 EFIAPI

 HookReturnFromSmm (

-  IN     UINTN                 CpuIndex,

   IN OUT SMRAM_SAVE_STATE_MAP  *CpuState,

   IN     UINT64                NewInstructionPointer32,

   IN     UINT64                NewInstructionPointer

diff --git a/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c b/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c
index 53f3084363..cd6778e3fc 100644
--- a/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c
+++ b/UefiCpuPkg/Library/SmmRelocationLib/X64/Semaphore.c
@@ -28,14 +28,12 @@ SmmRelocationSemaphoreComplete32 (
   can be executed immediately after AP exits SMM to indicate to

   the BSP that an AP has exited SMM after SMBASE relocation.

 

-  @param[in] CpuIndex     The processor index.

   @param[in] RebasedFlag  A pointer to a flag that is set to TRUE

                           immediately after AP exits SMM.

 

 **/

 VOID

 SemaphoreHook (

-  IN UINTN             CpuIndex,

   IN volatile BOOLEAN  *RebasedFlag

   )

 {

@@ -51,7 +49,6 @@ SemaphoreHook (
 

   CpuState                      = (SMRAM_SAVE_STATE_MAP *)(UINTN)(SMM_DEFAULT_SMBASE + SMRAM_SAVE_STATE_MAP_OFFSET);

   mSmmRelocationOriginalAddress = HookReturnFromSmm (

-                                    CpuIndex,

                                     CpuState,

                                     (UINT64)(UINTN)&SmmRelocationSemaphoreComplete32,

                                     (UINT64)(UINTN)&SmmRelocationSemaphoreComplete