On Fri, 10 May 2024 at 12:08, Dun Tan <dun....@intel.com> wrote: > > Save MTRR by lockbox in CpuS3DataDxe. In S3 boot, > The MTRR setting will be restored in S3Resume.c > in following patches. Then S3Resume.c will wakeup > all APs to load the MTRR setting. This can avoid > waking up APs in CpuS3.c. > > Signed-off-by: Dun Tan <dun....@intel.com> > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Jiaxin Wu <jiaxin...@intel.com>
Reviewed-by: Ard Biesheuvel <a...@kernel.org> > --- > OvmfPkg/CpuS3DataDxe/CpuS3Data.c | 11 +++++++++++ > OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 2 ++ > 2 files changed, 13 insertions(+) > > diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c > b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c > index 289048b75d..d1aba32842 100644 > --- a/OvmfPkg/CpuS3DataDxe/CpuS3Data.c > +++ b/OvmfPkg/CpuS3DataDxe/CpuS3Data.c > @@ -26,6 +26,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include <Library/MemoryAllocationLib.h> > #include <Library/MtrrLib.h> > #include <Library/UefiBootServicesTableLib.h> > +#include <Library/LockBoxLib.h> > > #include <Protocol/MpService.h> > #include <Guid/EventGroup.h> > @@ -130,6 +131,16 @@ CpuS3DataOnEndOfDxe ( > DEBUG ((DEBUG_VERBOSE, "%a\n", __func__)); > MtrrGetAllMtrrs (&AcpiCpuDataEx->MtrrTable); > > + // > + // Save MTRR in lockbox > + // > + Status = SaveLockBox ( > + &gEdkiiS3MtrrSettingGuid, > + &AcpiCpuDataEx->MtrrTable, > + sizeof (MTRR_SETTINGS) > + ); > + ASSERT_EFI_ERROR (Status); > + > // > // Close event, so it will not be invoked again. > // > diff --git a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf > b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf > index 228d5ae1b2..f5032a9222 100644 > --- a/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf > +++ b/OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf > @@ -46,9 +46,11 @@ > MtrrLib > UefiBootServicesTableLib > UefiDriverEntryPoint > + LockBoxLib > > [Guids] > gEfiEndOfDxeEventGroupGuid ## CONSUMES ## Event > + gEdkiiS3MtrrSettingGuid > > [Protocols] > gEfiMpServiceProtocolGuid ## CONSUMES > -- > 2.31.1.windows.1 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119077): https://edk2.groups.io/g/devel/message/119077 Mute This Topic: https://groups.io/mt/106018122/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
