From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org 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 4F4D7211F35C9 for ; Wed, 3 Apr 2019 05:46:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D9B462D7F3; Wed, 3 Apr 2019 12:46:46 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-127.rdu2.redhat.com [10.10.120.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 90FAA46440; Wed, 3 Apr 2019 12:46:45 +0000 (UTC) To: Hao Wu , edk2-devel@lists.01.org Cc: Jordan Justen , David Woodhouse References: <20190403070036.1404-1-hao.a.wu@intel.com> <20190403070036.1404-5-hao.a.wu@intel.com> From: Laszlo Ersek Message-ID: Date: Wed, 3 Apr 2019 14:46:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190403070036.1404-5-hao.a.wu@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 03 Apr 2019 12:46:47 +0000 (UTC) Subject: Re: [RFC PATCH v1 4/8] OvmfPkg/8259InterruptControllerDxe: Update to make it build for OVMF 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, 03 Apr 2019 12:46:48 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 04/03/19 09:00, Hao Wu wrote: > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1496 > > Several updates have been made to the > OvmfPkg/8259InterruptControllerDxe driver to make it build under OvmfPkg: > > A) Update the driver INF file to consume PCDs defined within OvmfPkg; > B) Remove the unnecessary dependency on the IntelFrameworkPkg header file > 'FrameworkDxe.h'; > C) Remove the IntelFrameworkPkg & PcAtChipsetPkg DEC files dependency in > the driver INF file. > > A new GUID has been updated for the INF file. > > Corresponding changes have been made in OVMF DSC files as well in order to > verify the build. (1) This patch is really well done, but we need an extra hint here, in the last paragraph of the commit message, namely that the DSC and FDF files will get a final update (= removals) later in this series. With that spelled out: Reviewed-by: Laszlo Ersek Thanks Laszlo > > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Cc: David Woodhouse > Cc: Ray Ni > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Hao Wu > --- > OvmfPkg/OvmfPkgIa32.dsc | 2 ++ > OvmfPkg/OvmfPkgIa32X64.dsc | 2 ++ > OvmfPkg/OvmfPkgX64.dsc | 2 ++ > OvmfPkg/8259InterruptControllerDxe/8259.inf | 11 +++++------ > OvmfPkg/8259InterruptControllerDxe/8259.h | 4 +--- > 5 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index f55ab5a3d2..47182f0cad 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -517,6 +517,7 @@ > > # IRQs 5, 9, 10, 11 are level-triggered > gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > > # Point to the MdeModulePkg/Application/UiApp/UiApp.inf > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > @@ -669,6 +670,7 @@ > > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf > + OvmfPkg/8259InterruptControllerDxe/8259.inf > UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > UefiCpuPkg/CpuDxe/CpuDxe.inf > PcAtChipsetPkg/8254TimerDxe/8254Timer.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 5c9bdf034e..d9603a7107 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -523,6 +523,7 @@ > > # IRQs 5, 9, 10, 11 are level-triggered > gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > > # Point to the MdeModulePkg/Application/UiApp/UiApp.inf > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > @@ -678,6 +679,7 @@ > > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf > + OvmfPkg/8259InterruptControllerDxe/8259.inf > UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > UefiCpuPkg/CpuDxe/CpuDxe.inf > PcAtChipsetPkg/8254TimerDxe/8254Timer.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 2943e9e8af..2cc39d54b0 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -522,6 +522,7 @@ > > # IRQs 5, 9, 10, 11 are level-triggered > gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > > # Point to the MdeModulePkg/Application/UiApp/UiApp.inf > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > @@ -676,6 +677,7 @@ > > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf > + OvmfPkg/8259InterruptControllerDxe/8259.inf > UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > UefiCpuPkg/CpuDxe/CpuDxe.inf > PcAtChipsetPkg/8254TimerDxe/8254Timer.inf > diff --git a/OvmfPkg/8259InterruptControllerDxe/8259.inf b/OvmfPkg/8259InterruptControllerDxe/8259.inf > index 1d9be675e3..c5a1385418 100644 > --- a/OvmfPkg/8259InterruptControllerDxe/8259.inf > +++ b/OvmfPkg/8259InterruptControllerDxe/8259.inf > @@ -1,7 +1,7 @@ > ## @file > # 8259 Interrupt Controller driver that provides Legacy 8259 protocol. > # > -# Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.
> +# Copyright (c) 2005 - 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 > # which accompanies this distribution. The full text of the license may be found at > @@ -16,7 +16,7 @@ > INF_VERSION = 0x00010005 > BASE_NAME = Legacy8259 > MODULE_UNI_FILE = Legacy8259.uni > - FILE_GUID = 79CA4208-BBA1-4a9a-8456-E1E66A81484E > + FILE_GUID = 245CB4DA-8E15-4A1B-87E3-9878FFA07520 > MODULE_TYPE = DXE_DRIVER > VERSION_STRING = 1.0 > ENTRY_POINT = Install8259 > @@ -27,8 +27,7 @@ > > [Packages] > MdePkg/MdePkg.dec > - IntelFrameworkPkg/IntelFrameworkPkg.dec > - PcAtChipsetPkg/PcAtChipsetPkg.dec > + OvmfPkg/OvmfPkg.dec > > [LibraryClasses] > UefiBootServicesTableLib > @@ -42,8 +41,8 @@ > gEfiPciIoProtocolGuid ## SOMETIMES_CONSUMES > > [Pcd] > - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeMask ## CONSUMES > - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel ## CONSUMES > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeMask ## CONSUMES > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel ## CONSUMES > > [Depex] > TRUE > diff --git a/OvmfPkg/8259InterruptControllerDxe/8259.h b/OvmfPkg/8259InterruptControllerDxe/8259.h > index 0d4c1e8223..80a4e23959 100644 > --- a/OvmfPkg/8259InterruptControllerDxe/8259.h > +++ b/OvmfPkg/8259InterruptControllerDxe/8259.h > @@ -1,7 +1,7 @@ > /** @file > Driver implementing the Tiano Legacy 8259 Protocol > > -Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.
> +Copyright (c) 2005 - 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 > which accompanies this distribution. The full text of the license may be found at > @@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. > #ifndef _8259_H__ > #define _8259_H__ > > -#include > - > #include > #include > >