From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: hao.a.wu@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Wed, 03 Apr 2019 20:02:29 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Apr 2019 20:02:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,306,1549958400"; d="scan'208";a="220388154" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga001.jf.intel.com with ESMTP; 03 Apr 2019 20:02:28 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 3 Apr 2019 20:02:27 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 3 Apr 2019 20:02:27 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.39]) with mapi id 14.03.0415.000; Thu, 4 Apr 2019 11:02:25 +0800 From: "Wu, Hao A" To: Laszlo Ersek , "devel@edk2.groups.io" CC: "Justen, Jordan L" , David Woodhouse Subject: Re: [edk2] [RFC PATCH v1 4/8] OvmfPkg/8259InterruptControllerDxe: Update to make it build for OVMF Thread-Topic: [edk2] [RFC PATCH v1 4/8] OvmfPkg/8259InterruptControllerDxe: Update to make it build for OVMF Thread-Index: AQHU6esJFavPwqFWPEmlEyh4NWq0Y6Yp3KMAgAF1HeA= Date: Thu, 4 Apr 2019 03:02:24 +0000 Message-ID: References: <20190403070036.1404-1-hao.a.wu@intel.com> <20190403070036.1404-5-hao.a.wu@intel.com> In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: hao.a.wu@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Laszlo Ersek > Sent: Wednesday, April 03, 2019 8:47 PM > To: Wu, Hao A; edk2-devel@lists.01.org > Cc: Justen, Jordan L; David Woodhouse > Subject: Re: [edk2] [RFC PATCH v1 4/8] OvmfPkg/8259InterruptControllerDxe= : > Update to make it build for OVMF >=20 > On 04/03/19 09:00, Hao Wu wrote: > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1496 > > > > 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. >=20 > (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 (=3D removals) later in this series. Agree. I will update the log message to reflect this. Best Regards, Hao Wu >=20 > With that spelled out: >=20 > Reviewed-by: Laszlo Ersek >=20 > Thanks > Laszlo >=20 > > > > 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, 0= x66, > 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, 0= x66, > 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, 0= x66, > 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 th= e > BSD License > > # which accompanies this distribution. The full text of the license m= ay be > found at > > @@ -16,7 +16,7 @@ > > INF_VERSION =3D 0x00010005 > > BASE_NAME =3D Legacy8259 > > MODULE_UNI_FILE =3D Legacy8259.uni > > - FILE_GUID =3D 79CA4208-BBA1-4a9a-8456-E1E66A814= 84E > > + FILE_GUID =3D 245CB4DA-8E15-4A1B-87E3-9878FFA07= 520 > > MODULE_TYPE =3D DXE_DRIVER > > VERSION_STRING =3D 1.0 > > ENTRY_POINT =3D 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 > > > > >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel