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.115; helo=mga14.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 ABAAD211B6C23 for ; Wed, 16 Jan 2019 17:27:26 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2019 17:27:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,488,1539673200"; d="scan'208";a="119115912" Received: from shzintpr01.sh.intel.com (HELO [10.7.209.27]) ([10.239.4.80]) by orsmga003.jf.intel.com with ESMTP; 16 Jan 2019 17:27:24 -0800 To: Julien Grall , Laszlo Ersek Cc: edk2-devel@lists.01.org, star.zeng@intel.com References: <1547479196-40248-1-git-send-email-star.zeng@intel.com> <1547479196-40248-11-git-send-email-star.zeng@intel.com> <7da72765-785c-2499-eefd-d887a946c946@redhat.com> <6263ebd0-4c6a-97bd-7e04-c4f26ec21aa2@linaro.org> From: "Zeng, Star" Message-ID: <01237fea-c440-a810-eb51-45646f26238e@intel.com> Date: Thu, 17 Jan 2019 09:26:53 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <6263ebd0-4c6a-97bd-7e04-c4f26ec21aa2@linaro.org> Subject: Re: [PATCH V2 10/15] ArmVirtXen: Use merged variable driver for emulated NV mode 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: Thu, 17 Jan 2019 01:27:26 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit On 2019/1/16 22:26, Julien Grall wrote: > Hi Laszlo, > > On 15/01/2019 09:37, Laszlo Ersek wrote: >> 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. >>> >>> The real variable driver has been updated to support emulated >>> variable NV mode and the EmuVariableRuntimeDxe will be removed >>> later, so use merged variable driver for emulated NV mode. >>> >>> Cc: Laszlo Ersek >>> Cc: Ard Biesheuvel >>> Cc: Julien Grall >>> Contributed-under: TianoCore Contribution Agreement 1.1 >>> Signed-off-by: Star Zeng >>> --- >>>   ArmVirtPkg/ArmVirtXen.dsc | 9 +++++++-- >>>   ArmVirtPkg/ArmVirtXen.fdf | 4 ++-- >>>   2 files changed, 9 insertions(+), 4 deletions(-) >>> >>> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc >>> index a29d8a4ae717..db85fb3402d0 100644 >>> --- a/ArmVirtPkg/ArmVirtXen.dsc >>> +++ b/ArmVirtPkg/ArmVirtXen.dsc >>> @@ -1,7 +1,7 @@ >>>   # >>>   #  Copyright (c) 2011-2015, ARM Limited. All rights reserved. >>>   #  Copyright (c) 2014, Linaro Limited. All rights reserved. >>> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights >>> reserved.
>>> +#  Copyright (c) 2015 - 2019, Intel Corporation. All rights >>> reserved.
>>>   # >>>   #  This program and the accompanying materials >>>   #  are licensed and made available under the terms and conditions >>> of the BSD License >>> @@ -101,6 +101,11 @@ [PcdsFixedAtBuild.common] >>>     # Set terminal type to TtyTerm, the value encoded is >>> EFI_TTY_TERM_GUID >>>     gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x80, 0x6d, >>> 0x91, 0x7d, 0xb1, 0x5b, 0x8c, 0x45, 0xa4, 0x8f, 0xe2, 0x5f, 0xdd, >>> 0x51, 0xef, 0x94} >>> +  # >>> +  # Make VariableRuntimeDxe work at emulated non-volatile variable >>> mode. >>> +  # >>> +  gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable|TRUE >>> + >>>   [PcdsPatchableInModule.common] >>>     # >>>     # This will be overridden in the code >>> @@ -172,7 +177,7 @@ [Components.common] >>>     MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >>>     MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >>> - >>> MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf >>> +  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >>> >>> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >>> >>> >>> MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf >>> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf >>> index 50e670254d52..5655c0df2926 100644 >>> --- a/ArmVirtPkg/ArmVirtXen.fdf >>> +++ b/ArmVirtPkg/ArmVirtXen.fdf >>> @@ -1,7 +1,7 @@ >>>   # >>>   #  Copyright (c) 2011-2015, ARM Limited. All rights reserved. >>>   #  Copyright (c) 2014, Linaro Limited. All rights reserved. >>> -#  Copyright (c) 2015 - 2017, Intel Corporation. All rights >>> reserved.
>>> +#  Copyright (c) 2015 - 2019, Intel Corporation. All rights >>> reserved.
>>>   # >>>   #  This program and the accompanying materials >>>   #  are licensed and made available under the terms and conditions >>> of the BSD License >>> @@ -137,7 +137,7 @@ [FV.FvMain] >>>     INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf >>>     INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >>> -  INF >>> MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf >>> +  INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf >>>     INF >>> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf >>> >>>     INF >>> MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf >>> >> >> Reviewed-by: Laszlo Ersek >> >> Julien, can you please regression test this series on Xen? The repo URL >> and the branch name are in the blurb. > > I will have a try and let you know the result. Thank you, Julien. I think you can try based on V3 series although there is no essential difference between V2 and V3. :) Repo: git@github.com:lzeng14/edk2.git Branch: MergedVariableDriver_EmuNvMode_V3 Thanks, Star > > Cheers, >