From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 18A5B2194D3B9 for ; Tue, 15 Jan 2019 00:15:33 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 92AD0C062D16; Tue, 15 Jan 2019 08:15:32 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-50.rdu2.redhat.com [10.10.120.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id B0AE15C1A1; Tue, 15 Jan 2019 08:15:31 +0000 (UTC) To: Star Zeng , edk2-devel@lists.01.org Cc: Hao Wu References: <1547479196-40248-1-git-send-email-star.zeng@intel.com> <1547479196-40248-7-git-send-email-star.zeng@intel.com> From: Laszlo Ersek Message-ID: Date: Tue, 15 Jan 2019 09:15:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <1547479196-40248-7-git-send-email-star.zeng@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 15 Jan 2019 08:15:32 +0000 (UTC) Subject: Re: [PATCH V2 06/15] MdeModulePkg Variable: Remove CacheOffset in UpdateVariable() 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: Tue, 15 Jan 2019 08:15:33 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 01/14/19 16:19, Star Zeng wrote: > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1323 > Merge EmuVariable and Real variable driver. > > CacheOffset could be removed in UpdateVariable() after > // > // update the memory copy of Flash region. > // > CopyMem ( > (UINT8 *)mNvVariableCache + CacheOffset, > (UINT8 *)NextVariable, VarSize > ); > > is moved to be before mVariableModuleGlobal->NonVolatileLastVariableOffset > value is updated, like right before > > mVariableModuleGlobal->NonVolatileLastVariableOffset += > HEADER_ALIGN (VarSize); > > This patch prepares for adding emulated variable NV mode > support in VariableRuntimeDxe. > > Cc: Jian J Wang > Cc: Hao Wu > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng > --- > MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > index 424f92a53757..4d524db30fec 100644 > --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c > @@ -2139,7 +2139,6 @@ UpdateVariable ( > VARIABLE_POINTER_TRACK *Variable; > VARIABLE_POINTER_TRACK NvVariable; > VARIABLE_STORE_HEADER *VariableStoreHeader; > - UINTN CacheOffset; > UINT8 *BufferForMerge; > UINTN MergedBufSize; > BOOLEAN DataReady; > @@ -2577,7 +2576,6 @@ UpdateVariable ( > // > // Step 1: > // > - CacheOffset = mVariableModuleGlobal->NonVolatileLastVariableOffset; > Status = UpdateVariableStore ( > &mVariableModuleGlobal->VariableGlobal, > FALSE, > @@ -2643,6 +2641,11 @@ UpdateVariable ( > goto Done; > } > > + // > + // update the memory copy of Flash region. > + // > + CopyMem ((UINT8 *)mNvVariableCache + mVariableModuleGlobal->NonVolatileLastVariableOffset, (UINT8 *)NextVariable, VarSize); > + > mVariableModuleGlobal->NonVolatileLastVariableOffset += HEADER_ALIGN (VarSize); > > if ((Attributes & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) { > @@ -2653,10 +2656,6 @@ UpdateVariable ( > mVariableModuleGlobal->CommonUserVariableTotalSize += HEADER_ALIGN (VarSize); > } > } > - // > - // update the memory copy of Flash region. > - // > - CopyMem ((UINT8 *)mNvVariableCache + CacheOffset, (UINT8 *)NextVariable, VarSize); > } else { > // > // Create a volatile variable. > Reviewed-by: Laszlo Ersek Thanks! Laszlo