From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 157E081F1F for ; Fri, 2 Dec 2016 03:35:04 -0800 (PST) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D1A5769F4; Fri, 2 Dec 2016 11:35:03 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-74.phx2.redhat.com [10.3.116.74]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB2BZ1Gq022646; Fri, 2 Dec 2016 06:35:02 -0500 To: Leif Lindholm References: <20161201175633.2538-1-lersek@redhat.com> <20161201175633.2538-5-lersek@redhat.com> <20161202110342.GS27069@bivouac.eciton.net> Cc: edk2-devel-01 , Ard Biesheuvel From: Laszlo Ersek Message-ID: Date: Fri, 2 Dec 2016 12:35:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <20161202110342.GS27069@bivouac.eciton.net> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 02 Dec 2016 11:35:03 +0000 (UTC) Subject: Re: [PATCH 4/5] ArmVirtPkg/QemuFwCfgLib: rebase lib instance to OvmfPkg/IndustryStandard X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Dec 2016 11:35:04 -0000 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 12/02/16 12:03, Leif Lindholm wrote: > On Thu, Dec 01, 2016 at 06:56:32PM +0100, Laszlo Ersek wrote: >> where "QemuFwCfgDma.h" was added in the previous patch. >> >> Cc: Ard Biesheuvel >> Contributed-under: TianoCore Contribution Agreement 1.0 >> Signed-off-by: Laszlo Ersek > > This is nice cleanup. > One bit of bikeshedding below, address or ignore - regardless: > Reviewed-by: Leif Lindholm > >> --- >> ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 24 +++----------------- >> 1 file changed, 3 insertions(+), 21 deletions(-) >> >> diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c >> index 2fd8d9050566..62a85dff328e 100644 >> --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c >> +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c >> @@ -25,6 +25,8 @@ >> >> #include >> >> +#include >> + > > So, I forget if we have official guidelines on this, but instinctively > I would put IndustryStandard before Library (alphabetically). Good point. But, in the next version, this #include directive will go away anyway, because this file already includes , and that header file will get the new macros in v2 (based on Jordan's feedback). Thanks! Laszlo > > Regards, > > Leif > >> STATIC UINTN mFwCfgSelectorAddress; >> STATIC UINTN mFwCfgDataAddress; >> STATIC UINTN mFwCfgDmaAddress; >> @@ -53,26 +55,6 @@ STATIC READ_BYTES_FUNCTION DmaReadBytes; >> // >> STATIC READ_BYTES_FUNCTION *InternalQemuFwCfgReadBytes = MmioReadBytes; >> >> -// >> -// Communication structure for DmaReadBytes(). All fields are encoded in big >> -// endian. >> -// >> -#pragma pack (1) >> -typedef struct { >> - UINT32 Control; >> - UINT32 Length; >> - UINT64 Address; >> -} FW_CFG_DMA_ACCESS; >> -#pragma pack () >> - >> -// >> -// Macros for the FW_CFG_DMA_ACCESS.Control bitmap (in native encoding). >> -// >> -#define FW_CFG_DMA_CTL_ERROR BIT0 >> -#define FW_CFG_DMA_CTL_READ BIT1 >> -#define FW_CFG_DMA_CTL_SKIP BIT2 >> -#define FW_CFG_DMA_CTL_SELECT BIT3 >> - >> >> /** >> Returns a boolean indicating if the firmware configuration interface >> @@ -183,7 +165,7 @@ QemuFwCfgInitialize ( >> >> QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion); >> Features = QemuFwCfgRead32 (); >> - if ((Features & BIT1) != 0) { >> + if ((Features & FW_CFG_F_DMA) != 0) { >> mFwCfgDmaAddress = FwCfgDmaAddress; >> InternalQemuFwCfgReadBytes = DmaReadBytes; >> } >> -- >> 2.9.2 >> >> >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel >