From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 669FA2034D8F0 for ; Thu, 22 Feb 2018 18:28:17 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Feb 2018 18:34:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,381,1515484800"; d="scan'208";a="20425077" Received: from shzintpr01.sh.intel.com (HELO [10.7.209.51]) ([10.239.4.80]) by orsmga006.jf.intel.com with ESMTP; 22 Feb 2018 18:34:16 -0800 To: Leif Lindholm Cc: "Kinney, Michael D" , "edk2-devel@lists.01.org" , "Gao, Liming" , star.zeng@intel.com References: <20171215165925.12306-1-leif.lindholm@linaro.org> <20171215165925.12306-2-leif.lindholm@linaro.org> <0C09AFA07DD0434D9E2A0C6AEB0483103B9C46A4@shsmsx102.ccr.corp.intel.com> <20180222200900.n7n3wy4dihdzlvqo@bivouac.eciton.net> From: "Zeng, Star" Message-ID: Date: Fri, 23 Feb 2018 10:33:46 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180222200900.n7n3wy4dihdzlvqo@bivouac.eciton.net> Subject: Re: [PATCH v2 1/3] MdePkg: restrict UefiMultiPhase.h contents if VFRCOMPILE defined X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Feb 2018 02:28:17 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Leif, On 2018/2/23 4:09, Leif Lindholm wrote: > Hi Star, > > I lost track of this one during my sabbatical until Ard's patch > earlier today jogged my memory. > > On Sun, Dec 17, 2017 at 11:23:10AM +0000, Zeng, Star wrote: >> You may submit a bugzilla for the long term approach as Liming >> suggested in V1 patch series, and then add the bug link in this >> commit log? > > I have raised https://bugzilla.tianocore.org/show_bug.cgi?id=878 > for the enhancement. > > Are you OK with the patch as below (it rebases cleanly to current > master) if I add the paragraph: > --- > https://bugzilla.tianocore.org/show_bug.cgi?id=878 has been raised to > request VfrCompile is extended to support the original format. > --- > to the end of the commit message? I am ok. With this update, Reviewed-by: Star Zeng . I have given RB to MdeModulePkg change before. :) You may also get opinion from Mike and Liming. Thanks, Star > > Regards, > > Leif >> >> >> >> Thanks, >> Star >> -----Original Message----- >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Leif Lindholm >> Sent: Saturday, December 16, 2017 12:59 AM >> To: edk2-devel@lists.01.org >> Cc: Kinney, Michael D ; Gao, Liming >> Subject: [edk2] [PATCH v2 1/3] MdePkg: restrict UefiMultiPhase.h contents if VFRCOMPILE defined >> >> Turns out all .vfr files in the tree interacting with DynamicPcds manually copy the same set of EFI_VARIABLE_* definitions, since the rest of UefiMultiPhase.h is incompatible with VfrCompile. >> >> Instead, reshuffle these definitions to the start of the file, and put the rest of the file behind #ifndef VFRCOMPILE to permit direct inclusion in .vfr source files. >> >> Cc: Michael D Kinney >> Cc: Liming Gao >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Leif Lindholm >> --- >> MdePkg/Include/Uefi/UefiMultiPhase.h | 44 ++++++++++---------- >> 1 file changed, 23 insertions(+), 21 deletions(-) >> >> diff --git a/MdePkg/Include/Uefi/UefiMultiPhase.h b/MdePkg/Include/Uefi/UefiMultiPhase.h >> index 0dcbb1b9ee..67ecc4c27c 100644 >> --- a/MdePkg/Include/Uefi/UefiMultiPhase.h >> +++ b/MdePkg/Include/Uefi/UefiMultiPhase.h >> @@ -15,6 +15,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. >> #ifndef __UEFI_MULTIPHASE_H__ >> #define __UEFI_MULTIPHASE_H__ >> >> +/// >> +/// Attributes of variable. >> +/// >> +#define EFI_VARIABLE_NON_VOLATILE 0x00000001 >> +#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 >> +#define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 >> +/// >> +/// This attribute is identified by the mnemonic 'HR' >> +/// elsewhere in this specification. >> +/// >> +#define EFI_VARIABLE_HARDWARE_ERROR_RECORD 0x00000008 >> +/// >> +/// Attributes of Authenticated Variable /// >> +#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x00000020 >> +#define EFI_VARIABLE_APPEND_WRITE 0x00000040 >> +/// >> +/// NOTE: EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and should be considered reserved. >> +/// >> +#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS 0x00000010 >> + >> +#ifndef VFRCOMPILE >> #include >> /// >> /// Enumeration of memory types introduced in UEFI. >> @@ -156,27 +178,6 @@ typedef struct { >> } EFI_TABLE_HEADER; >> >> /// >> -/// Attributes of variable. >> -/// >> -#define EFI_VARIABLE_NON_VOLATILE 0x00000001 >> -#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 >> -#define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 >> -/// >> -/// This attribute is identified by the mnemonic 'HR' >> -/// elsewhere in this specification. >> -/// >> -#define EFI_VARIABLE_HARDWARE_ERROR_RECORD 0x00000008 >> -/// >> -/// Attributes of Authenticated Variable -/// >> -#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x00000020 >> -#define EFI_VARIABLE_APPEND_WRITE 0x00000040 >> -/// >> -/// NOTE: EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS is deprecated and should be considered reserved. >> -/// >> -#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS 0x00000010 >> - >> -/// >> /// AuthInfo is a WIN_CERTIFICATE using the wCertificateType /// WIN_CERTIFICATE_UEFI_GUID and the CertType /// EFI_CERT_TYPE_RSA2048_SHA256_GUID. If the attribute specifies @@ -229,5 +230,6 @@ typedef struct { >> /// >> WIN_CERTIFICATE_UEFI_GUID AuthInfo; >> } EFI_VARIABLE_AUTHENTICATION_2; >> +#endif // VFRCOMPILE >> >> #endif >> -- >> 2.11.0 >> >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel