From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=julien.grall@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (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 9C1E2211B7F7F for ; Wed, 16 Jan 2019 06:26:36 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id l9so7077326wrt.13 for ; Wed, 16 Jan 2019 06:26:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=JqvVDmWc2NKKKOUHa8IninUXH+l8rUROU/GBGqedOpA=; b=goxcXOhDhB+zSbNh6NE6TpqhKnNCgEY9aFhV0yf+qn0Uejhna1z80tfPdc/gML0X+W XNXZ9qIzvqqKaXOWTsGwNH1/sDYIn1ZPQIuRHdSlaTskTfuy4i4xYFwUrTuvD7hYrWLv LzFUBxESJzkd9U9h/sLpLL83wy+L9pUld/Zrg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JqvVDmWc2NKKKOUHa8IninUXH+l8rUROU/GBGqedOpA=; b=rOs+KyOWFxjfL/nICb73OmS5rdcDEVcRg18AqyjrVZTu3P0JdwQFM4Hf6ZDvcaw7mR fpaOxgmEGZJyeSPR1tI+xixPqEzWTfmYtVEtIlyqH8P5m8CImad7wtIYccUH0rkAlmYx 2Hei5y4rnR2GErrWZuSg3wz+h8FtDdtopOh5d/fGB2S11f6GlYselMfbWXMOf+zd3nfS 9pN3nu+Wl21wYOC7el8apDQrdEfvp+Q/nGriKczV20GvFIMlf3n/5K3n6NsvvbCah4dq LrKa8F81lj2g1j29bqL2DKUAROlIur1tqAjUSSi5CZY7T0NuI/iEz7+JlcdemwBfsKq/ 2pNQ== X-Gm-Message-State: AJcUukduct29jrxlOFadGmBkf4IjZVHGAMS2sURSDCoTa1nXxQ6ce/vt noWqa+klh0gEyzghosSydAatN5DgCD4= X-Google-Smtp-Source: ALg8bN5XZ6KtUZ9LOnKbysW3vRncqt/8VlNKKWI0Jczf7FNIMDD/BFUoV/tVskKVDcQq4Sw4tTonoQ== X-Received: by 2002:adf:e54a:: with SMTP id z10mr7608436wrm.238.1547648793744; Wed, 16 Jan 2019 06:26:33 -0800 (PST) Received: from ?IPv6:::1? ([206.189.23.0]) by smtp.gmail.com with ESMTPSA id r77sm46621035wmd.22.2019.01.16.06.26.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 06:26:33 -0800 (PST) To: Laszlo Ersek , Star Zeng Cc: edk2-devel@lists.01.org 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> From: Julien Grall Message-ID: <6263ebd0-4c6a-97bd-7e04-c4f26ec21aa2@linaro.org> Date: Wed, 16 Jan 2019 14:26:32 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <7da72765-785c-2499-eefd-d887a946c946@redhat.com> 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: Wed, 16 Jan 2019 14:26:37 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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. Cheers, -- Julien Grall