OvmfPkg/SmmCpuFeaturesLib: Check SmBase relocation supported or not

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

This patch is to check SmBase relocation supported or not.
If gSmmBaseHobGuid found, means SmBase info has been relocated
and recorded in the SmBase array. ASSERT it's not supported in OVMF.

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>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

2 files changed, 14 insertions, 2 deletions

diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
index 6693666d04..a1dd10c9f2 100644
--- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
+++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c
@@ -1,7 +1,7 @@
 /** @file

   The CPU specific programming for PiSmmCpuDxeSmm module.

 

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

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

 

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

 **/

@@ -17,10 +17,12 @@
 #include <Library/SmmCpuFeaturesLib.h>

 #include <Library/SmmServicesTableLib.h>

 #include <Library/UefiBootServicesTableLib.h>

+#include <Library/HobLib.h>

 #include <Pcd/CpuHotEjectData.h>

 #include <PiSmm.h>

 #include <Register/Intel/SmramSaveStateMap.h>

 #include <Register/QemuSmramSaveStateMap.h>

+#include <Guid/SmmBaseHob.h>

 

 //

 // EFER register LMA bit

@@ -44,6 +46,12 @@ SmmCpuFeaturesLibConstructor (
   )

 {

   //

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

+  // in the SmBase array. ASSERT it's not supported in OVMF.

+  //

+  ASSERT (GetFirstGuidHob (&gSmmBaseHobGuid) == NULL);

+

+  //

   // No need to program SMRRs on our virtual platform.

   //

   return EFI_SUCCESS;

diff --git a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
index 8a426a4c10..2697a90525 100644
--- a/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
+++ b/OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf
@@ -1,7 +1,7 @@
 ## @file

 #  The CPU specific programming for PiSmmCpuDxeSmm module.

 #

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

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

 #

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

 #

@@ -35,6 +35,10 @@
   SafeIntLib

   SmmServicesTableLib

   UefiBootServicesTableLib

+  HobLib

+

+[Guids]

+  gSmmBaseHobGuid                ## CONSUMES

 

 [Pcd]

   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber