From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::142; helo=mail-it1-x142.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it1-x142.google.com (mail-it1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 080D121962301 for ; Wed, 16 Jan 2019 04:58:45 -0800 (PST) Received: by mail-it1-x142.google.com with SMTP id p197so2563826itp.0 for ; Wed, 16 Jan 2019 04:58:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=MhEK2RsoiGah25ihchqGa7whaKj9mjlZYPRqTEz20nc=; b=hcE6YaW1PsMGKfiVkkCND7n3y6oodcpeEc3ORGN0ZHcii+RdGw1ekwm6dQL6v6ezL7 DMMsXyhIh5LiJSM+Id51FNulJR2ug4TKtvuu7uMWgLpu6P8VZdR2SNKypVbWMkNEsxRr FgAyMSpece5wtKHXCXVfFb2EQydCyr7HE2w48= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=MhEK2RsoiGah25ihchqGa7whaKj9mjlZYPRqTEz20nc=; b=CZhhUByenKS5KP0qTjMehYd52rSYgNL/xrXgu0WlyF+ig1xnBnOony8Xqezh/aCa59 1FyNJwZGo7d9f8dRZojZwpukW6UCvYys/DUkwAMn8lGoVeOD6v3NxlUs8fX2egCvUvF9 u0B6hNFlHR5C/ySsL1B8RFhTBX26btwkroNWRL87kJwoHEmgx5kYASnNyR5XeTRz8A4d zjsdK7Y2NYmK5KhOw/n+tRLB33hmbsNS86hjFOS7HZZcv7fxE5PbI3Sva14xf5L4ODP3 hQCEMPuZ/y4sF5N4BQKLCNLd66bPajfBFpf1dxrL6RH0izb+7eKLoLcexcTg+Ob8KrBb Yggg== X-Gm-Message-State: AJcUukdwsNSVP2HbcbCuLdBOl+L/EzR1UfqcevrzM4TqYPowSMMf5TMk eEc9+Oasyl+AwHHHX+KmeB4gYXItcqBHNX54DzciOulI1G4= X-Google-Smtp-Source: ALg8bN4pt78FlQwainyTVmWxwP6wmyG3sQ4t3+VdTO7+iXgR8jp4B6L9lHMpBCML1wKTgaIhB50/MKSZxKwMqV+e0X4= X-Received: by 2002:a05:660c:4b:: with SMTP id p11mr5588607itk.71.1547643524880; Wed, 16 Jan 2019 04:58:44 -0800 (PST) MIME-Version: 1.0 References: <1547548179-42552-1-git-send-email-star.zeng@intel.com> <1547548179-42552-13-git-send-email-star.zeng@intel.com> In-Reply-To: <1547548179-42552-13-git-send-email-star.zeng@intel.com> From: Ard Biesheuvel Date: Wed, 16 Jan 2019 13:58:33 +0100 Message-ID: To: Star Zeng Cc: "edk2-devel@lists.01.org" , Laszlo Ersek , Julien Grall Subject: Re: [PATCH V3 12/17] 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: Wed, 16 Jan 2019 12:58:46 -0000 Content-Type: text/plain; charset="UTF-8" On Tue, 15 Jan 2019 at 11:29, 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 > Reviewed-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel > --- > 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 > -- > 2.7.0.windows.1 >