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 AC4E481992 for ; Thu, 5 Jan 2017 09:13:00 -0800 (PST) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 26DFF8FCF8; Thu, 5 Jan 2017 17:13:01 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-100.phx2.redhat.com [10.3.116.100]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v05HCwN2003041; Thu, 5 Jan 2017 12:12:59 -0500 To: Leo Duran , edk2-devel@ml01.01.org References: <1483571273-11187-1-git-send-email-leo.duran@amd.com> <1483571273-11187-5-git-send-email-leo.duran@amd.com> Cc: brijesh.singh@amd.com, liming.gao@intel.com, michael.d.kinney@intel.com, jeff.fan@intel.com From: Laszlo Ersek Message-ID: Date: Thu, 5 Jan 2017 18:12:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1483571273-11187-5-git-send-email-leo.duran@amd.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 05 Jan 2017 17:13:01 +0000 (UTC) Subject: Re: [PATCH 4/4] Modify QemuFwCfgLib to use new BaseIoFifoLib library. 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: Thu, 05 Jan 2017 17:13:00 -0000 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 01/05/17 00:07, Leo Duran wrote: > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Brijesh Singh > Reviewed-by: Leo Duran > --- > OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm | 55 ----------------------- > OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 1 + > OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 7 +-- > OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm | 52 --------------------- > 4 files changed, 2 insertions(+), 113 deletions(-) > delete mode 100644 OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm > delete mode 100644 OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm Please also remove the function prototypes in "QemuFwCfgLib.c" that are no longer necessary (because now they come from the IoFifoLib class header). The patch looks reasonable otherwise. Thanks! Laszlo > diff --git a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm b/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm > deleted file mode 100644 > index faa22e9..0000000 > --- a/OvmfPkg/Library/QemuFwCfgLib/Ia32/IoLibExAsm.nasm > +++ /dev/null > @@ -1,55 +0,0 @@ > -;------------------------------------------------------------------------------ > -; > -; Copyright (c) 2006 - 2013, 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 > -; which accompanies this distribution. The full text of the license may be found at > -; http://opensource.org/licenses/bsd-license.php. > -; > -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > -; > -;------------------------------------------------------------------------------ > - > - SECTION .text > - > -;------------------------------------------------------------------------------ > -; VOID > -; EFIAPI > -; IoReadFifo8 ( > -; IN UINTN Port, > -; IN UINTN Size, > -; IN VOID *Buffer > -; ); > -;------------------------------------------------------------------------------ > -global ASM_PFX(IoReadFifo8) > -ASM_PFX(IoReadFifo8): > - > - mov dx, [esp + 4] > - mov ecx, [esp + 8] > - push edi > - mov edi, [esp + 16] > -rep insb > - pop edi > - ret > - > -;------------------------------------------------------------------------------ > -; VOID > -; EFIAPI > -; IoWriteFifo8 ( > -; IN UINTN Port, > -; IN UINTN Size, > -; IN VOID *Buffer > -; ); > -;------------------------------------------------------------------------------ > -global ASM_PFX(IoWriteFifo8) > -ASM_PFX(IoWriteFifo8): > - > - mov dx, [esp + 4] > - mov ecx, [esp + 8] > - push esi > - mov esi, [esp + 16] > -rep outsb > - pop esi > - ret > - > diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > index 0bbf121..ea59bc5 100644 > --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c > @@ -18,6 +18,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > index 66ac778..6fbb702 100644 > --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf > @@ -36,12 +36,6 @@ > QemuFwCfgLib.c > QemuFwCfgPeiDxe.c > > -[Sources.IA32] > - Ia32/IoLibExAsm.nasm > - > -[Sources.X64] > - X64/IoLibExAsm.nasm > - > [Packages] > MdePkg/MdePkg.dec > OvmfPkg/OvmfPkg.dec > @@ -51,5 +45,6 @@ > BaseMemoryLib > DebugLib > IoLib > + IoFifoLib > MemoryAllocationLib > > diff --git a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm b/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm > deleted file mode 100644 > index f1078f2..0000000 > --- a/OvmfPkg/Library/QemuFwCfgLib/X64/IoLibExAsm.nasm > +++ /dev/null > @@ -1,52 +0,0 @@ > -;------------------------------------------------------------------------------ > -; > -; Copyright (c) 2006 - 2013, 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 > -; which accompanies this distribution. The full text of the license may be found at > -; http://opensource.org/licenses/bsd-license.php. > -; > -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, > -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > -; > -;------------------------------------------------------------------------------ > - > - DEFAULT REL > - SECTION .text > - > -;------------------------------------------------------------------------------ > -; VOID > -; EFIAPI > -; IoReadFifo8 ( > -; IN UINTN Port, // rcx > -; IN UINTN Size, // rdx > -; IN VOID *Buffer // r8 > -; ); > -;------------------------------------------------------------------------------ > -global ASM_PFX(IoReadFifo8) > -ASM_PFX(IoReadFifo8): > - > - xchg rcx, rdx > - xchg rdi, r8 ; rdi: buffer address; r8: save rdi > -rep insb > - mov rdi, r8 ; restore rdi > - ret > - > -;------------------------------------------------------------------------------ > -; VOID > -; EFIAPI > -; IoWriteFifo8 ( > -; IN UINTN Port, // rcx > -; IN UINTN Size, // rdx > -; IN VOID *Buffer // r8 > -; ); > -;------------------------------------------------------------------------------ > -global ASM_PFX(IoWriteFifo8) > -ASM_PFX(IoWriteFifo8): > - > - xchg rcx, rdx > - xchg rsi, r8 ; rdi: buffer address; r8: save rdi > -rep outsb > - mov rsi, r8 ; restore rdi > - ret > - >