I remember both Gerd and I have provided R-b. You can carry the R-B on the patch since it doesn't change. Reviewed-by: Ray Ni <ray...@intel.com>
> -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, > Jiaxin > Sent: Monday, February 13, 2023 4:44 PM > To: devel@edk2.groups.io > Cc: Dong, Eric <eric.d...@intel.com>; Ni, Ray <ray...@intel.com>; Zeng, Star > <star.z...@intel.com>; Laszlo Ersek <ler...@redhat.com>; Gerd Hoffmann > <kra...@redhat.com>; Kumar, Rahul R <rahul.r.ku...@intel.com> > Subject: [edk2-devel] [PATCH v6 6/6] 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.d...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Zeng Star <star.z...@intel.com> > Cc: Laszlo Ersek <ler...@redhat.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Cc: Rahul Kumar <rahul1.ku...@intel.com> > Signed-off-by: Jiaxin Wu <jiaxin...@intel.com> > --- > OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.c | 10 > +++++++++- > OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf | 6 +++++- > 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,9 +1,9 @@ > /** @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 > **/ > > #include <IndustryStandard/Q35MchIch9.h> > @@ -15,14 +15,16 @@ > #include <Library/PcdLib.h> > #include <Library/SafeIntLib.h> > #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 > // > #define LMA BIT10 > @@ -41,10 +43,16 @@ EFIAPI > SmmCpuFeaturesLibConstructor ( > IN EFI_HANDLE ImageHandle, > IN EFI_SYSTEM_TABLE *SystemTable > ) > { > + // > + // 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,9 +1,9 @@ > ## @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 > # > ## > > @@ -33,10 +33,14 @@ > MemoryAllocationLib > PcdLib > SafeIntLib > SmmServicesTableLib > UefiBootServicesTableLib > + HobLib > + > +[Guids] > + gSmmBaseHobGuid ## CONSUMES > > [Pcd] > gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber > gUefiOvmfPkgTokenSpaceGuid.PcdCpuHotEjectDataAddress > gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase > -- > 2.16.2.windows.1 > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#100071): https://edk2.groups.io/g/devel/message/100071 Mute This Topic: https://groups.io/mt/96932005/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
