From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6746D81FC8 for ; Mon, 6 Feb 2017 19:09:32 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 06 Feb 2017 19:09:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,344,1477983600"; d="scan'208";a="1103962250" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga001.fm.intel.com with ESMTP; 06 Feb 2017 19:09:31 -0800 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 6 Feb 2017 19:09:31 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 6 Feb 2017 19:09:31 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.59]) by SHSMSX103.ccr.corp.intel.com ([10.239.4.69]) with mapi id 14.03.0248.002; Tue, 7 Feb 2017 11:09:29 +0800 From: "Ni, Ruiyu" To: "Kinney, Michael D" , "edk2-devel@lists.01.org" CC: "Tian, Feng" , "Fan, Jeff" Thread-Topic: [edk2] [PATCH v2 3/6] MdeModulePkg/IncompatiblePciDevice: Do not use deprecated macros Thread-Index: AQHSgD6AJmaYt9JjmEeQuJza2DUbmqFbua0AgAAEBICAASDlQA== Date: Tue, 7 Feb 2017 03:09:29 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5B898883@SHSMSX104.ccr.corp.intel.com> References: <20170206060059.595976-1-ruiyu.ni@intel.com> <20170206060059.595976-4-ruiyu.ni@intel.com> In-Reply-To: Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v2 3/6] MdeModulePkg/IncompatiblePciDevice: Do not use deprecated macros 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: Tue, 07 Feb 2017 03:09:32 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Mike, OK I will change to MAX_UINT64. Thanks/Ray > -----Original Message----- > From: Kinney, Michael D > Sent: Tuesday, February 7, 2017 1:55 AM > To: Ni, Ruiyu ; edk2-devel@lists.01.org; Kinney, Mich= ael > D > Cc: Tian, Feng ; Fan, Jeff > Subject: RE: [edk2] [PATCH v2 3/6] MdeModulePkg/IncompatiblePciDevice: > Do not use deprecated macros >=20 > Ray, >=20 > As a follow up, I do see the PI Specification using (UINTN)-1 and (UINT64= )-1. >=20 > I think the intent is unsigned values with all bits set, which is what th= e > MAX_UINTx macros provide in the EDK II without depending on type casting > a signed value to an unsigned value. >=20 > Mike >=20 > > -----Original Message----- > > From: Kinney, Michael D > > Sent: Monday, February 6, 2017 9:41 AM > > To: Ni, Ruiyu ; edk2-devel@lists.01.org; Kinney, > > Michael D > > Cc: Tian, Feng ; Fan, Jeff > > Subject: RE: [edk2] [PATCH v2 3/6] MdeModulePkg/IncompatiblePciDevice: > > Do not use deprecated macros > > > > Ray, > > > > Can we use MAX_UINT64 instead of (UINT64)-1? > > > > Thanks, > > > > Mike > > > > > -----Original Message----- > > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf > > > Of Ruiyu Ni > > > Sent: Sunday, February 5, 2017 10:01 PM > > > To: edk2-devel@lists.01.org > > > Cc: Tian, Feng ; Fan, Jeff > > > Subject: [edk2] [PATCH v2 3/6] MdeModulePkg/IncompatiblePciDevice: > > > Do not use deprecated macros > > > > > > The patch replaces the following macros: > > > DEVICE_ID_NOCARE (0xFF) --> (UINT64)-1 PCI_ACPI_UNUSED (0) --> 0 > > > PCI_BAR_ALL (0xFF) --> (UINT64)-1 PCI_BAR_NOCHANGE (0) --> 0 > > > PCI_BAR_EVEN_ALIGN --> EVEN_ALIGN (local definition) > > > > > > Since the PciBus driver was updated to accept Spec defined values in > > > previous commit, the above replacements don't impact functionality. > > > > > > Contributed-under: TianoCore Contribution Agreement 1.0 > > > Signed-off-by: Ruiyu Ni > > > Cc: Jeff Fan > > > Cc: Feng Tian > > > --- > > > .../IncompatiblePciDeviceSupport.c | 108 ++++++++++-= ---------- > > > 1 file changed, 53 insertions(+), 55 deletions(-) > > > > > > diff --git > > > > > > a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/Incompatible > Pci > > DeviceSupport.c > > > > > > b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/Incompatible > Pci > > DeviceSupport.c > > > index 3d581b6..5a6a052 100644 > > > --- > > > > > > a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/Incompatible > Pci > > DeviceSupport.c > > > +++ > > > > > > b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/Incompatible > Pci > > DeviceSupport.c > > > @@ -1,11 +1,11 @@ > > > /** @file > > > This module is one template module for Incompatible PCI Device > Support protocol. > > > - It includes one incompatile pci devices list template. > > > + It includes one incompatible pci devices list template. > > > > > > Incompatible PCI Device Support protocol allows the PCI bus driver= to > support > > > resource allocation for some PCI devices that do not comply with > > > the PCI Specification. > > > > > > -Copyright (c) 2009, Intel Corporation. All rights reserved.
> > > +Copyright (c) 2009 - 2017, 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 @@ -48,13 +48,11 @@ typedef struct { #define > > > PCI_DEVICE_ID(VendorId, DeviceId, Revision, SubVendorId, SubDeviceId) > \ > > > VendorId, DeviceId, Revision, SubVendorId, SubDeviceId > > > > > > -#define PCI_BAR_TYPE_IO ACPI_ADDRESS_SPACE_TYPE_IO > > > -#define PCI_BAR_TYPE_MEM ACPI_ADDRESS_SPACE_TYPE_MEM > > > - > > > #define DEVICE_INF_TAG 0xFFF2 > > > #define DEVICE_RES_TAG 0xFFF1 > > > #define LIST_END_TAG 0x0000 > > > > > > +#define EVEN_ALIGN 0xFFFFFFFFFFFFFFFEULL > > > > > > /** > > > Returns a list of ACPI resource descriptors that detail the > > > special @@ -114,72 +112,72 @@ GLOBAL_REMOVE_IF_UNREFERENCED > UINT64 > > > mIncompatiblePciDeviceList[] =3D { > > > // Device Adaptec 9004 > > > // > > > DEVICE_INF_TAG, > > > - PCI_DEVICE_ID(0x9004, DEVICE_ID_NOCARE, DEVICE_ID_NOCARE, > > > DEVICE_ID_NOCARE, DEVICE_ID_NOCARE), > > > + PCI_DEVICE_ID(0x9004, (UINT64)-1, (UINT64)-1, (UINT64)-1, > > > + (UINT64)-1), > > > DEVICE_RES_TAG, > > > - PCI_BAR_TYPE_IO, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_BAR_EVEN_ALIGN, > > > - PCI_BAR_ALL, > > > - PCI_BAR_NOCHANGE, > > > + ACPI_ADDRESS_SPACE_TYPE_IO, > > > + 0, > > > + 0, > > > + 0, > > > + 0, > > > + EVEN_ALIGN, > > > + (UINT64)-1, > > > + 0, > > > // > > > // Device Adaptec 9005 > > > // > > > DEVICE_INF_TAG, > > > - PCI_DEVICE_ID(0x9005, DEVICE_ID_NOCARE, DEVICE_ID_NOCARE, > > > DEVICE_ID_NOCARE, DEVICE_ID_NOCARE), > > > + PCI_DEVICE_ID(0x9005, (UINT64)-1, (UINT64)-1, (UINT64)-1, > > > + (UINT64)-1), > > > DEVICE_RES_TAG, > > > - PCI_BAR_TYPE_IO, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_BAR_EVEN_ALIGN, > > > - PCI_BAR_ALL, > > > - PCI_BAR_NOCHANGE, > > > + ACPI_ADDRESS_SPACE_TYPE_IO, > > > + 0, > > > + 0, > > > + 0, > > > + 0, > > > + EVEN_ALIGN, > > > + (UINT64)-1, > > > + 0, > > > // > > > // Device QLogic 1007 > > > // > > > DEVICE_INF_TAG, > > > - PCI_DEVICE_ID(0x1077, DEVICE_ID_NOCARE, DEVICE_ID_NOCARE, > > > DEVICE_ID_NOCARE, DEVICE_ID_NOCARE), > > > + PCI_DEVICE_ID(0x1077, (UINT64)-1, (UINT64)-1, (UINT64)-1, > > > + (UINT64)-1), > > > DEVICE_RES_TAG, > > > - PCI_BAR_TYPE_IO, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_BAR_EVEN_ALIGN, > > > - PCI_BAR_ALL, > > > - PCI_BAR_NOCHANGE, > > > + ACPI_ADDRESS_SPACE_TYPE_IO, > > > + 0, > > > + 0, > > > + 0, > > > + 0, > > > + EVEN_ALIGN, > > > + (UINT64)-1, > > > + 0, > > > // > > > // Device Agilent 103C > > > // > > > DEVICE_INF_TAG, > > > - PCI_DEVICE_ID(0x103C, DEVICE_ID_NOCARE, DEVICE_ID_NOCARE, > > > DEVICE_ID_NOCARE, DEVICE_ID_NOCARE), > > > + PCI_DEVICE_ID(0x103C, (UINT64)-1, (UINT64)-1, (UINT64)-1, > > > + (UINT64)-1), > > > DEVICE_RES_TAG, > > > - PCI_BAR_TYPE_IO, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_BAR_EVEN_ALIGN, > > > - PCI_BAR_ALL, > > > - PCI_BAR_NOCHANGE, > > > + ACPI_ADDRESS_SPACE_TYPE_IO, > > > + 0, > > > + 0, > > > + 0, > > > + 0, > > > + EVEN_ALIGN, > > > + (UINT64)-1, > > > + 0, > > > // > > > // Device Agilent 15BC > > > // > > > DEVICE_INF_TAG, > > > - PCI_DEVICE_ID(0x15BC, DEVICE_ID_NOCARE, DEVICE_ID_NOCARE, > > > DEVICE_ID_NOCARE, DEVICE_ID_NOCARE), > > > + PCI_DEVICE_ID(0x15BC, (UINT64)-1, (UINT64)-1, (UINT64)-1, > > > + (UINT64)-1), > > > DEVICE_RES_TAG, > > > - PCI_BAR_TYPE_IO, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_ACPI_UNUSED, > > > - PCI_BAR_EVEN_ALIGN, > > > - PCI_BAR_ALL, > > > - PCI_BAR_NOCHANGE, > > > + ACPI_ADDRESS_SPACE_TYPE_IO, > > > + 0, > > > + 0, > > > + 0, > > > + 0, > > > + EVEN_ALIGN, > > > + (UINT64)-1, > > > + 0, > > > // > > > // The end of the list > > > // > > > @@ -285,31 +283,31 @@ PCheckDevice ( > > > // > > > // See if the Header matches the parameters passed in > > > // > > > - if (Header->VendorId !=3D DEVICE_ID_NOCARE) { > > > + if (Header->VendorId !=3D (UINT64)-1) { > > > if (Header->VendorId !=3D VendorId) { > > > continue; > > > } > > > } > > > > > > - if (Header->DeviceId !=3D DEVICE_ID_NOCARE) { > > > + if (Header->DeviceId !=3D (UINT64)-1) { > > > if (DeviceId !=3D Header->DeviceId) { > > > continue; > > > } > > > } > > > > > > - if (Header->RevisionId !=3D DEVICE_ID_NOCARE) { > > > + if (Header->RevisionId !=3D (UINT64)-1) { > > > if (RevisionId !=3D Header->RevisionId) { > > > continue; > > > } > > > } > > > > > > - if (Header->SubsystemVendorId !=3D DEVICE_ID_NOCARE) { > > > + if (Header->SubsystemVendorId !=3D (UINT64)-1) { > > > if (SubsystemVendorId !=3D Header->SubsystemVendorId) { > > > continue; > > > } > > > } > > > > > > - if (Header->SubsystemDeviceId !=3D DEVICE_ID_NOCARE) { > > > + if (Header->SubsystemDeviceId !=3D (UINT64)-1) { > > > if (SubsystemDeviceId !=3D Header->SubsystemDeviceId) { > > > continue; > > > } > > > -- > > > 2.9.0.windows.1 > > > > > > _______________________________________________ > > > edk2-devel mailing list > > > edk2-devel@lists.01.org > > > https://lists.01.org/mailman/listinfo/edk2-devel