From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 80552211B5A2A for ; Mon, 14 Jan 2019 07:20:07 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jan 2019 07:20:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,478,1539673200"; d="scan'208";a="116647423" Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.158.46]) by fmsmga008.fm.intel.com with ESMTP; 14 Jan 2019 07:20:06 -0800 From: Star Zeng To: edk2-devel@lists.01.org Cc: Star Zeng , Jian J Wang , Hao Wu Date: Mon, 14 Jan 2019 23:19:45 +0800 Message-Id: <1547479196-40248-5-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 In-Reply-To: <1547479196-40248-1-git-send-email-star.zeng@intel.com> References: <1547479196-40248-1-git-send-email-star.zeng@intel.com> Subject: [PATCH V2 04/15] MdeModulePkg Variable: Abstract VariableWriteServiceInitializeDxe/Smm X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2019 15:20:07 -0000 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1323 Merge EmuVariable and Real variable driver. Abstract VariableWriteServiceInitializeDxe/Smm from FtwNotificationEvent/SmmFtwNotificationEvent, then VariableWriteServiceInitializeDxe/Smm could be not aware the NV storage is real or emulated. This patch prepares for adding emulated variable NV mode support in VariableRuntimeDxe. Cc: Jian J Wang Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng --- .../Universal/Variable/RuntimeDxe/VariableDxe.c | 55 ++++++++++++++-------- .../Universal/Variable/RuntimeDxe/VariableSmm.c | 43 ++++++++++++----- 2 files changed, 66 insertions(+), 32 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c index baba6729c1c2..5131e6f351e4 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c @@ -346,6 +346,40 @@ OnEndOfDxe ( } /** + Initializes variable write service for DXE. + +**/ +VOID +VariableWriteServiceInitializeDxe ( + VOID + ) +{ + EFI_STATUS Status; + + Status = VariableWriteServiceInitialize (); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Variable write service initialization failed. Status = %r\n", Status)); + } + + // + // Some Secure Boot Policy Var (SecureBoot, etc) updates following other + // Secure Boot Policy Variable change. Record their initial value. + // + RecordSecureBootPolicyVarData(); + + // + // Install the Variable Write Architectural protocol. + // + Status = gBS->InstallProtocolInterface ( + &mHandle, + &gEfiVariableWriteArchProtocolGuid, + EFI_NATIVE_INTERFACE, + NULL + ); + ASSERT_EFI_ERROR (Status); +} + +/** Fault Tolerant Write protocol notification event handler. Non-Volatile variable write may needs FTW protocol to reclaim when @@ -428,27 +462,10 @@ FtwNotificationEvent ( } } - Status = VariableWriteServiceInitialize (); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "Variable write service initialization failed. Status = %r\n", Status)); - } - // - // Some Secure Boot Policy Var (SecureBoot, etc) updates following other - // Secure Boot Policy Variable change. Record their initial value. + // Initializes variable write service after FTW was ready. // - RecordSecureBootPolicyVarData(); - - // - // Install the Variable Write Architectural protocol. - // - Status = gBS->InstallProtocolInterface ( - &mHandle, - &gEfiVariableWriteArchProtocolGuid, - EFI_NATIVE_INTERFACE, - NULL - ); - ASSERT_EFI_ERROR (Status); + VariableWriteServiceInitializeDxe (); // // Close the notify event to avoid install gEfiVariableWriteArchProtocolGuid again. diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c index 018587ed7373..e63af812534e 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c @@ -846,6 +846,34 @@ SmmEndOfDxeCallback ( } /** + Initializes variable write service for SMM. + +**/ +VOID +VariableWriteServiceInitializeSmm ( + VOID + ) +{ + EFI_STATUS Status; + + Status = VariableWriteServiceInitialize (); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "Variable write service initialization failed. Status = %r\n", Status)); + } + + // + // Notify the variable wrapper driver the variable write service is ready + // + Status = gBS->InstallProtocolInterface ( + &mSmmVariableHandle, + &gSmmVariableWriteGuid, + EFI_NATIVE_INTERFACE, + NULL + ); + ASSERT_EFI_ERROR (Status); +} + +/** SMM Fault Tolerant Write protocol notification event handler. Non-Volatile variable write may needs FTW protocol to reclaim when @@ -909,21 +937,10 @@ SmmFtwNotificationEvent ( mVariableModuleGlobal->FvbInstance = FvbProtocol; - Status = VariableWriteServiceInitialize (); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "Variable write service initialization failed. Status = %r\n", Status)); - } - // - // Notify the variable wrapper driver the variable write service is ready + // Initializes variable write service after FTW was ready. // - Status = gBS->InstallProtocolInterface ( - &mSmmVariableHandle, - &gSmmVariableWriteGuid, - EFI_NATIVE_INTERFACE, - NULL - ); - ASSERT_EFI_ERROR (Status); + VariableWriteServiceInitializeSmm (); return EFI_SUCCESS; } -- 2.7.0.windows.1