UefiCpuPkg/PiSmmCpuDxeSmm: Remove SmBases relocation logic

This patch is to remove legacy SmBase relocation in
PiSmmCpuDxeSmm Driver. The responsibility for SmBase
relocation has been transferred to the SmmRelocationInit
interface, which now handles the following tasks:
1. Relocates the SmBase for each processor.
2. Generates the gSmmBaseHobGuid HOB.

As a result of this change, the PiSmmCpuDxeSmm driver's
role in SMM environment setup is simplified to:
1. Utilize the gSmmBaseHobGuid to determine the SmBase.
2. Perform the ExecuteFirstSmiInit() to do early SMM
initialization.

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>

1 files changed, 4 insertions, 17 deletions

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
index b14c289a27..d67fb49890 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
@@ -641,23 +641,10 @@ InitializeCpuProcedure (
   }

 

   if (IsBsp) {

-    DEBUG ((DEBUG_INFO, "SmmRestoreCpu: mSmmRelocated is %d\n", mSmmRelocated));

-

     //

-    // Check whether Smm Relocation is done or not.

-    // If not, will do the SmmBases Relocation here!!!

+    // Issue SMI IPI (All Excluding  Self SMM IPI + BSP SMM IPI) to execute first SMI init.

     //

-    if (!mSmmRelocated) {

-      //

-      // Restore SMBASE for BSP and all APs

-      //

-      SmmRelocateBases ();

-    } else {

-      //

-      // Issue SMI IPI (All Excluding  Self SMM IPI + BSP SMM IPI) to execute first SMI init.

-      //

-      ExecuteFirstSmiInit ();

-    }

+    ExecuteFirstSmiInit ();

   }

 

   //

@@ -980,9 +967,9 @@ InitSmmS3ResumeState (
       SmmS3ResumeState->SmmS3StackSize = 0;

     }

 

-    SmmS3ResumeState->SmmS3Cr0 = mSmmCr0;

+    SmmS3ResumeState->SmmS3Cr0 = (UINT32)AsmReadCr0 ();

     SmmS3ResumeState->SmmS3Cr3 = Cr3;

-    SmmS3ResumeState->SmmS3Cr4 = mSmmCr4;

+    SmmS3ResumeState->SmmS3Cr4 = (UINT32)AsmReadCr4 ();

 

     if (sizeof (UINTN) == sizeof (UINT64)) {

       SmmS3ResumeState->Signature = SMM_S3_RESUME_SMM_64;