Looks good. Reviewed-by: Yao, Jiewen <[email protected]>
-----Original Message----- From: Zeng, Star Sent: Wednesday, June 10, 2015 5:23 PM To: [email protected] Cc: Yao, Jiewen; Ni, Ruiyu Subject: [PATCH 2/2] MdeModulePkg Variable: Move VariableLock install into SmmVariableReady(). VariableLock in VariableSmmRuntimeDxe.c is installed in EntryPoint now. It works based on SMM variable handler by SMM communication with payload buffer. But the payload buffer and SMM variable handler will be not ready in EntryPoint before SmmVariableReady() call back. VarCheck in VariableSmmRuntimeDxe.c has the same issue, so move VarCheck install into SmmVariableReady() also. Cc: Jiewen Yao <[email protected]> Cc: Ruiyu Ni <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <[email protected]> --- .../Variable/RuntimeDxe/VariableSmmRuntimeDxe.c | 41 +++++++++++----------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c index 0e0a7c5..30fb5df 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.c @@ -935,6 +935,26 @@ SmmVariableReady ( NULL ); ASSERT_EFI_ERROR (Status); + + mVariableLock.RequestToLock = VariableLockRequestToLock; Status = + gBS->InstallMultipleProtocolInterfaces ( + &mHandle, + &gEdkiiVariableLockProtocolGuid, + &mVariableLock, + NULL + ); + ASSERT_EFI_ERROR (Status); + + mVarCheck.RegisterSetVariableCheckHandler = + VarCheckRegisterSetVariableCheckHandler; + mVarCheck.VariablePropertySet = VarCheckVariablePropertySet; + mVarCheck.VariablePropertyGet = VarCheckVariablePropertyGet; Status = + gBS->InstallMultipleProtocolInterfaces ( + &mHandle, + &gEdkiiVarCheckProtocolGuid, + &mVarCheck, + NULL + ); + ASSERT_EFI_ERROR (Status); } @@ -992,7 +1012,6 @@ VariableSmmRuntimeInitialize ( IN EFI_SYSTEM_TABLE *SystemTable ) { - EFI_STATUS Status; VOID *SmmVariableRegistration; VOID *SmmVariableWriteRegistration; EFI_EVENT OnReadyToBootEvent; @@ -1001,26 +1020,6 @@ VariableSmmRuntimeInitialize ( EfiInitializeLock (&mVariableServicesLock, TPL_NOTIFY); - mVariableLock.RequestToLock = VariableLockRequestToLock; - Status = gBS->InstallMultipleProtocolInterfaces ( - &mHandle, - &gEdkiiVariableLockProtocolGuid, - &mVariableLock, - NULL - ); - ASSERT_EFI_ERROR (Status); - - mVarCheck.RegisterSetVariableCheckHandler = VarCheckRegisterSetVariableCheckHandler; - mVarCheck.VariablePropertySet = VarCheckVariablePropertySet; - mVarCheck.VariablePropertyGet = VarCheckVariablePropertyGet; - Status = gBS->InstallMultipleProtocolInterfaces ( - &mHandle, - &gEdkiiVarCheckProtocolGuid, - &mVarCheck, - NULL - ); - ASSERT_EFI_ERROR (Status); - // // Smm variable service is ready // -- 1.9.5.msysgit.0 ------------------------------------------------------------------------------ _______________________________________________ edk2-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/edk2-devel
