UefiCpuPkg/SmmCpuFeaturesLib: Skip SMBASE configuration

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4337

This patch is to avoid configure SMBASE if SmBase relocation has been
done. If gSmmBaseHobGuid found, means SmBase info has been relocated
and recorded in the SmBase array. No need to do the relocation in
SmmCpuFeaturesInitializeProcessor().

Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Zeng Star <star.zeng@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Acked-by: 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>

6 files changed, 36 insertions, 9 deletions

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/CpuFeaturesLib.h b/UefiCpuPkg/Library/SmmCpuFeaturesLib/CpuFeaturesLib.h
index fd3e902547..c2e4fbe96b 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/CpuFeaturesLib.h
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/CpuFeaturesLib.h
@@ -9,11 +9,13 @@
 #ifndef CPU_FEATURES_LIB_H_

 #define CPU_FEATURES_LIB_H_

 

+#include <Guid/SmmBaseHob.h>

 #include <Library/SmmCpuFeaturesLib.h>

 #include <Library/BaseLib.h>

 #include <Library/PcdLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/DebugLib.h>

+#include <Library/HobLib.h>

 

 /**

   Performs library initialization.

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c b/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c
index d5eaaa7a99..1a2c706fa1 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/IntelSmmCpuFeaturesLib.c
@@ -1,7 +1,7 @@
 /** @file

 Implementation shared across all library instances.

 

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

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

 Copyright (c) Microsoft Corporation.<BR>

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

 

@@ -39,6 +39,12 @@ UINT32  mSmrrPhysBaseMsr = SMM_FEATURES_LIB_IA32_SMRR_PHYSBASE;
 UINT32  mSmrrPhysMaskMsr = SMM_FEATURES_LIB_IA32_SMRR_PHYSMASK;

 

 //

+// Indicate SmBase for each Processors has been relocated or not. If TRUE,

+// means no need to do the relocation in SmmCpuFeaturesInitializeProcessor().

+//

+BOOLEAN  mSmmCpuFeaturesSmmRelocated;

+

+//

 // Set default value to assume MTRRs need to be configured on each SMI

 //

 BOOLEAN  mNeedConfigureMtrrs = TRUE;

@@ -144,6 +150,12 @@ CpuFeaturesLibInitialization (
   //

   mSmrrEnabled = (BOOLEAN *)AllocatePool (sizeof (BOOLEAN) * GetCpuMaxLogicalProcessorNumber ());

   ASSERT (mSmrrEnabled != NULL);

+

+  //

+  // If gSmmBaseHobGuid found, means SmBase info has been relocated and recorded

+  // in the SmBase array.

+  //

+  mSmmCpuFeaturesSmmRelocated = (BOOLEAN)(GetFirstGuidHob (&gSmmBaseHobGuid) != NULL);

 }

 

 /**

@@ -187,10 +199,15 @@ SmmCpuFeaturesInitializeProcessor (
   UINTN                 ModelId;

 

   //

-  // Configure SMBASE.

+  // No need to configure SMBASE if SmBase relocation has been done.

   //

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

-  CpuState->x86.SMBASE = (UINT32)CpuHotPlugData->SmBase[CpuIndex];

+  if (!mSmmCpuFeaturesSmmRelocated) {

+    //

+    // Configure SMBASE.

+    //

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

+    CpuState->x86.SMBASE = (UINT32)CpuHotPlugData->SmBase[CpuIndex];

+  }

 

   //

   // Intel(R) 64 and IA-32 Architectures Software Developer's Manual

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
index 9ac7dde78f..46ae2bf85e 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  The CPU specific programming for PiSmmCpuDxeSmm module.

 #

-#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

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

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

 #

 ##

@@ -33,6 +33,10 @@
   PcdLib

   MemoryAllocationLib

   DebugLib

+  HobLib

+

+[Guids]

+  gSmmBaseHobGuid                ## CONSUMES

 

 [Pcd]

   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber        ## SOMETIMES_CONSUMES

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf
index 86d367e0a0..51322ff189 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLibStm.inf
@@ -2,7 +2,7 @@
 #  The CPU specific programming for PiSmmCpuDxeSmm module when STM support

 #  is included.

 #

-#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

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

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

 #

 ##

@@ -64,6 +64,7 @@
   gMsegSmramGuid                           ## SOMETIMES_CONSUMES ## HOB

   gEfiAcpi20TableGuid                      ## SOMETIMES_CONSUMES ## SystemTable

   gEfiAcpi10TableGuid                      ## SOMETIMES_CONSUMES ## SystemTable

+  gSmmBaseHobGuid                          ## CONSUMES

 

 [Pcd]

   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber        ## SOMETIMES_CONSUMES

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
index 3cf162ada0..6cb1c515c0 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/SmmStm.c
@@ -1,14 +1,13 @@
 /** @file

   SMM STM support functions

 

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

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

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

 

 **/

 

 #include <PiMm.h>

 #include <Library/BaseMemoryLib.h>

-#include <Library/HobLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/SmmServicesTableLib.h>

 #include <Library/TpmMeasurementLib.h>

diff --git a/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf b/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf
index b1f60a5505..c836939d33 100644
--- a/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf
+++ b/UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Standalone MM CPU specific programming.

 #

-#  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

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

 #  Copyright (c) Microsoft Corporation.<BR>

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

 #

@@ -34,6 +34,10 @@
   DebugLib

   MemoryAllocationLib

   PcdLib

+  HobLib

+

+[Guids]

+  gSmmBaseHobGuid                ## CONSUMES

 

 [FixedPcd]

   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber        ## SOMETIMES_CONSUMES