Revision: 19045
http://sourceforge.net/p/edk2/code/19045
Author: lersek
Date: 2015-11-30 18:42:01 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
OvmfPkg: AcpiS3SaveDxe: don't fake LockBox protocol if SMM_REQUIRE
In SVN r15306 (git commit d4ba06df), "OvmfPkg: S3 Resume: fake LockBox
protocol for BootScriptExecutorDxe", we installed a fake LockBox protocol
in OVMF's AcpiS3SaveDxe clone. While our other AcpiS3SaveDxe
customizations remain valid (or harmless), said change is invalid when
OVMF is built with -D SMM_REQUIRE and includes the real protocol provider,
"MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf".
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/15306
Modified Paths:
--------------
trunk/edk2/OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c
trunk/edk2/OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
Modified: trunk/edk2/OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c
===================================================================
--- trunk/edk2/OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c 2015-11-30 18:41:56 UTC
(rev 19044)
+++ trunk/edk2/OvmfPkg/AcpiS3SaveDxe/AcpiS3Save.c 2015-11-30 18:42:01 UTC
(rev 19045)
@@ -538,12 +538,14 @@
return EFI_LOAD_ERROR;
}
- Status = gBS->InstallMultipleProtocolInterfaces (
- &ImageHandle,
- &gEfiLockBoxProtocolGuid, NULL,
- NULL
- );
- ASSERT_EFI_ERROR (Status);
+ if (!FeaturePcdGet (PcdSmmSmramRequire)) {
+ Status = gBS->InstallMultipleProtocolInterfaces (
+ &ImageHandle,
+ &gEfiLockBoxProtocolGuid, NULL,
+ NULL
+ );
+ ASSERT_EFI_ERROR (Status);
+ }
Status = gBS->CreateEventEx (
EVT_NOTIFY_SIGNAL,
Modified: trunk/edk2/OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf
===================================================================
--- trunk/edk2/OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf 2015-11-30 18:41:56 UTC
(rev 19044)
+++ trunk/edk2/OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf 2015-11-30 18:42:01 UTC
(rev 19045)
@@ -59,7 +59,7 @@
gEfiEndOfDxeEventGroupGuid ## CONSUMES ## Event
[Protocols]
- gEfiLockBoxProtocolGuid # PROTOCOL ALWAYS_PRODUCED
+ gEfiLockBoxProtocolGuid # PROTOCOL SOMETIMES_PRODUCED
gEfiLegacyBiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiLegacyRegion2ProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
gFrameworkEfiMpServiceProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
@@ -71,6 +71,7 @@
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize ##
CONSUMES
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3BootScriptStackSize ##
CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
+ gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire ##
CONSUMES
[Depex]
gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
