From: "Wu, Hao A" <hao.a.wu@intel.com>
To: "Zeng, Star" <star.zeng@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH V2 04/15] MdeModulePkg Variable: Abstract VariableWriteServiceInitializeDxe/Smm
Date: Tue, 15 Jan 2019 06:37:47 +0000 [thread overview]
Message-ID: <B80AF82E9BFB8E4FBD8C89DA810C6A093C87E60C@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <1547479196-40248-5-git-send-email-star.zeng@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Best Regards,
Hao Wu
> -----Original Message-----
> From: Zeng, Star
> Sent: Monday, January 14, 2019 11:20 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star; Wang, Jian J; Wu, Hao A
> Subject: [PATCH V2 04/15] MdeModulePkg Variable: Abstract
> VariableWriteServiceInitializeDxe/Smm
>
> 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 <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
> .../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
next prev parent reply other threads:[~2019-01-15 6:37 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 15:19 [PATCH V2 00/15] Merge EmuVariable and Real variable driver Star Zeng
2019-01-14 15:19 ` [PATCH V2 01/15] MdeModulePkg Variable: Add some missing changes for 9b18845 Star Zeng
2019-01-15 6:36 ` Wu, Hao A
2019-01-15 8:06 ` Laszlo Ersek
2019-01-14 15:19 ` [PATCH V2 02/15] MdeModulePkg Variable: Abstract InitRealNonVolatileVariableStore Star Zeng
2019-01-15 6:37 ` Wu, Hao A
2019-01-14 15:19 ` [PATCH V2 03/15] MdeModulePkg Variable: Not get NV PCD in VariableWriteServiceInitialize Star Zeng
2019-01-15 5:48 ` Wu, Hao A
2019-01-15 5:53 ` Zeng, Star
2019-01-15 6:37 ` Wang, Jian J
2019-01-15 10:13 ` Zeng, Star
2019-01-14 15:19 ` [PATCH V2 04/15] MdeModulePkg Variable: Abstract VariableWriteServiceInitializeDxe/Smm Star Zeng
2019-01-15 6:37 ` Wu, Hao A [this message]
2019-01-15 8:05 ` Wang, Jian J
2019-01-14 15:19 ` [PATCH V2 05/15] MdeModulePkg: Add PcdEmuVariableNvModeEnable in dec Star Zeng
2019-01-15 5:05 ` Wang, Jian J
2019-01-15 5:55 ` Zeng, Star
2019-01-15 6:37 ` Wu, Hao A
2019-01-14 15:19 ` [PATCH V2 06/15] MdeModulePkg Variable: Remove CacheOffset in UpdateVariable() Star Zeng
2019-01-15 6:37 ` Wu, Hao A
2019-01-15 8:04 ` Wang, Jian J
2019-01-15 9:58 ` Laszlo Ersek
2019-01-15 10:10 ` Zeng, Star
2019-01-15 8:15 ` Laszlo Ersek
2019-01-14 15:19 ` [PATCH V2 07/15] MdeModulePkg Variable: type case VolatileBase to UINTN directly Star Zeng
2019-01-15 6:37 ` Wu, Hao A
2019-01-15 8:06 ` Wang, Jian J
2019-01-15 8:18 ` Laszlo Ersek
2019-01-14 15:19 ` [PATCH V2 08/15] MdeModulePkg Variable: Add emulated variable NV mode support Star Zeng
2019-01-15 6:01 ` Wang, Jian J
2019-01-15 6:16 ` Zeng, Star
2019-01-15 9:53 ` Laszlo Ersek
2019-01-15 9:33 ` Laszlo Ersek
2019-01-15 9:52 ` Zeng, Star
2019-01-14 15:19 ` [PATCH V2 09/15] MdeModulePkg VariablePei: Don't check BOOT_IN_RECOVERY_MODE Star Zeng
2019-01-14 15:19 ` [PATCH V2 10/15] ArmVirtXen: Use merged variable driver for emulated NV mode Star Zeng
2019-01-15 9:37 ` Laszlo Ersek
2019-01-16 14:26 ` Julien Grall
2019-01-17 1:26 ` Zeng, Star
2019-01-17 18:59 ` Julien Grall
2019-01-21 10:46 ` Zeng, Star
2019-01-21 13:36 ` Julien Grall
2019-01-21 19:40 ` Ard Biesheuvel
2019-01-22 4:30 ` Zeng, Star
2019-01-23 1:41 ` Zeng, Star
2019-01-23 12:15 ` Julien Grall
2019-01-23 14:20 ` Zeng, Star
2019-01-21 21:15 ` Laszlo Ersek
2019-01-21 21:22 ` Ard Biesheuvel
2019-01-21 21:25 ` Ard Biesheuvel
2019-01-14 15:19 ` [PATCH V2 11/15] ArmVirtXen: Link VarCheckUefiLib NULL class library instance Star Zeng
2019-01-15 9:39 ` Laszlo Ersek
2019-01-14 15:19 ` [PATCH V2 12/15] BeagleBoardPkg: Use merged variable driver for emulated NV mode Star Zeng
2019-01-14 22:11 ` Leif Lindholm
2019-01-15 1:32 ` Zeng, Star
2019-01-15 9:48 ` Leif Lindholm
2019-01-14 15:19 ` [PATCH V2 13/15] QuarkMin: " Star Zeng
2019-01-14 15:19 ` [PATCH V2 14/15] CorebootPayloadPkg: " Star Zeng
2019-01-14 15:19 ` [PATCH V2 15/15] MdeModulePkg: Remove EmuVariableRuntimeDxe Star Zeng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=B80AF82E9BFB8E4FBD8C89DA810C6A093C87E60C@SHSMSX101.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox