mirror of https://github.com/acidanthera/audk.git
OvmfPkg/SmmAccess: close and lock SMRAM at default SMBASE
During normal boot, when EFI_DXE_SMM_READY_TO_LOCK_PROTOCOL is installed by platform BDS, the SMM IPL locks SMRAM (TSEG) through EFI_SMM_ACCESS2_PROTOCOL.Lock(). See SmmIplReadyToLockEventNotify() in "MdeModulePkg/Core/PiSmmCore/PiSmmIpl.c". During S3 resume, S3Resume2Pei locks SMRAM (TSEG) through PEI_SMM_ACCESS_PPI.Lock(), before executing the boot script. See S3ResumeExecuteBootScript() in "UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c". Those are precisely the places where the SMRAM at the default SMBASE should be locked too. Add such an action to SmramAccessLock(). Notes: - The SMRAM at the default SMBASE doesn't support the "closed and unlocked" state (and so it can't be closed without locking it, and it cannot be opened after closing it). - The SMRAM at the default SMBASE isn't (and shouldn't) be exposed with another EFI_SMRAM_DESCRIPTOR in the GetCapabilities() members of EFI_SMM_ACCESS2_PROTOCOL / PEI_SMM_ACCESS_PPI. That's because the SMRAM in question is not "general purpose"; it's only QEMU's solution to protect the initial SMI handler from the OS, when a VCPU is hot-plugged. Consequently, the state of the SMRAM at the default SMBASE is not reflected in the "OpenState" / "LockState" fields of the protocol and PPI. - An alternative to extending SmramAccessLock() would be to register an EFI_DXE_SMM_READY_TO_LOCK_PROTOCOL notify in SmmAccess2Dxe (for locking at normal boot), and an EDKII_S3_SMM_INIT_DONE_GUID PPI notify in SmmAccessPei (for locking at S3 resume). Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Jordan Justen <jordan.l.justen@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1512 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Jiewen Yao <jiewen.yao@intel.com> Message-Id: <20200129214412.2361-10-lersek@redhat.com> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
parent
300aae1180
commit
9108fc17b0
|
@ -145,6 +145,13 @@ SmmAccess2DxeEntryPoint (
|
|||
|
||||
InitQ35TsegMbytes ();
|
||||
GetStates (&mAccess2.LockState, &mAccess2.OpenState);
|
||||
|
||||
//
|
||||
// SmramAccessLock() depends on "mQ35SmramAtDefaultSmbase"; init the latter
|
||||
// just before exposing the former via EFI_SMM_ACCESS2_PROTOCOL.Lock().
|
||||
//
|
||||
InitQ35SmramAtDefaultSmbase ();
|
||||
|
||||
return gBS->InstallMultipleProtocolInterfaces (&ImageHandle,
|
||||
&gEfiSmmAccess2ProtocolGuid, &mAccess2,
|
||||
NULL);
|
||||
|
|
|
@ -49,6 +49,7 @@
|
|||
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire
|
||||
|
||||
[Pcd]
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes
|
||||
|
||||
[Depex]
|
||||
|
|
|
@ -372,6 +372,12 @@ SmmAccessPeiEntryPoint (
|
|||
CopyMem (GuidHob, &SmramMap[DescIdxSmmS3ResumeState],
|
||||
sizeof SmramMap[DescIdxSmmS3ResumeState]);
|
||||
|
||||
//
|
||||
// SmramAccessLock() depends on "mQ35SmramAtDefaultSmbase"; init the latter
|
||||
// just before exposing the former via PEI_SMM_ACCESS_PPI.Lock().
|
||||
//
|
||||
InitQ35SmramAtDefaultSmbase ();
|
||||
|
||||
//
|
||||
// We're done. The next step should succeed, but even if it fails, we can't
|
||||
// roll back the above BuildGuidHob() allocation, because PEI doesn't support
|
||||
|
|
|
@ -54,6 +54,7 @@
|
|||
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire
|
||||
|
||||
[Pcd]
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase
|
||||
gUefiOvmfPkgTokenSpaceGuid.PcdQ35TsegMbytes
|
||||
|
||||
[Ppis]
|
||||
|
|
|
@ -21,6 +21,12 @@
|
|||
//
|
||||
UINT16 mQ35TsegMbytes;
|
||||
|
||||
//
|
||||
// The value of PcdQ35SmramAtDefaultSmbase is saved into this variable at
|
||||
// module startup.
|
||||
//
|
||||
STATIC BOOLEAN mQ35SmramAtDefaultSmbase;
|
||||
|
||||
/**
|
||||
Save PcdQ35TsegMbytes into mQ35TsegMbytes.
|
||||
**/
|
||||
|
@ -32,6 +38,17 @@ InitQ35TsegMbytes (
|
|||
mQ35TsegMbytes = PcdGet16 (PcdQ35TsegMbytes);
|
||||
}
|
||||
|
||||
/**
|
||||
Save PcdQ35SmramAtDefaultSmbase into mQ35SmramAtDefaultSmbase.
|
||||
**/
|
||||
VOID
|
||||
InitQ35SmramAtDefaultSmbase (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
mQ35SmramAtDefaultSmbase = PcdGetBool (PcdQ35SmramAtDefaultSmbase);
|
||||
}
|
||||
|
||||
/**
|
||||
Read the MCH_SMRAM and ESMRAMC registers, and update the LockState and
|
||||
OpenState fields in the PEI_SMM_ACCESS_PPI / EFI_SMM_ACCESS2_PROTOCOL object,
|
||||
|
@ -125,6 +142,14 @@ SmramAccessLock (
|
|||
PciOr8 (DRAMC_REGISTER_Q35 (MCH_ESMRAMC), MCH_ESMRAMC_T_EN);
|
||||
PciOr8 (DRAMC_REGISTER_Q35 (MCH_SMRAM), MCH_SMRAM_D_LCK);
|
||||
|
||||
//
|
||||
// Close & lock the SMRAM at the default SMBASE, if it exists.
|
||||
//
|
||||
if (mQ35SmramAtDefaultSmbase) {
|
||||
PciWrite8 (DRAMC_REGISTER_Q35 (MCH_DEFAULT_SMBASE_CTL),
|
||||
MCH_DEFAULT_SMBASE_LCK);
|
||||
}
|
||||
|
||||
GetStates (LockState, OpenState);
|
||||
if (*OpenState || !*LockState) {
|
||||
return EFI_DEVICE_ERROR;
|
||||
|
|
|
@ -38,6 +38,14 @@ InitQ35TsegMbytes (
|
|||
VOID
|
||||
);
|
||||
|
||||
/**
|
||||
Save PcdQ35SmramAtDefaultSmbase into mQ35SmramAtDefaultSmbase.
|
||||
**/
|
||||
VOID
|
||||
InitQ35SmramAtDefaultSmbase (
|
||||
VOID
|
||||
);
|
||||
|
||||
/**
|
||||
Read the MCH_SMRAM and ESMRAMC registers, and update the LockState and
|
||||
OpenState fields in the PEI_SMM_ACCESS_PPI / EFI_SMM_ACCESS2_PROTOCOL object,
|
||||
|
|
Loading…
Reference in New Issue