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 D474881F39 for ; Thu, 9 Feb 2017 11:47:09 -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 45DC41A0D16; Thu, 9 Feb 2017 19:47:10 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-51.phx2.redhat.com [10.3.116.51]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v19Jl8Nx023623; Thu, 9 Feb 2017 14:47:09 -0500 To: Ruiyu Ni , edk2-devel@ml01.01.org References: <20170208094258.59568-2-ruiyu.ni@intel.com> <20170209020659.41512-1-ruiyu.ni@intel.com> Cc: Jeff Fan , Liming Gao From: Laszlo Ersek Message-ID: <7db080eb-8fe1-4448-15f1-d1f67f32c9d6@redhat.com> Date: Thu, 9 Feb 2017 20:47:06 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <20170209020659.41512-1-ruiyu.ni@intel.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.39]); Thu, 09 Feb 2017 19:47:10 +0000 (UTC) Subject: Re: [PATCH v4 6/6] MdePkg/Pci22.h: Deprecate out-of-Spec IncompatiblePciDevice 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: Thu, 09 Feb 2017 19:47:10 -0000 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 02/09/17 03:06, Ruiyu Ni wrote: > DEVICE_ID_NOCARE is defined as 0xFFFF but Spec says (UINT64) -1 > should be used to match any VendorId/DeviceId/RevisionId/ > SubsystemVendorId/SubsystemDeviceId. > > PCI_BAR_OLD_ALIGN/PCI_BAR_EVEN_ALIGN/PCI_BAR_SQUAD_ALIGN/ > PCI_BAR_DQUAD_ALIGN are defined but Spec doesn't have such > definitions. > > PCI_BAR_ALL is defined as 0xFF but Spec says (UINT64)-1 should be > used to match all BARs. > > PCI_ACPI_UNUSED and PCI_BAR_NOCHANGE are defined as 0 which > compliant with Spec but the name is too general and causes confusing. > IncompatiblePciDeviceSupport could directly use 0. > > All of the above macros are marked as deprecated. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Ruiyu Ni > Cc: Liming Gao > Cc: Jeff Fan > --- > MdePkg/Include/IndustryStandard/Pci22.h | 27 ++++++++++++++++++--------- > 1 file changed, 18 insertions(+), 9 deletions(-) > > diff --git a/MdePkg/Include/IndustryStandard/Pci22.h b/MdePkg/Include/IndustryStandard/Pci22.h > index 4cf8389..07718dc 100644 > --- a/MdePkg/Include/IndustryStandard/Pci22.h > +++ b/MdePkg/Include/IndustryStandard/Pci22.h > @@ -7,7 +7,7 @@ > PC Card Standard, 8.0 > PCI Power Management Interface Specifiction, Revision 1.2 > > - Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
> Copyright (c) 2014 - 2015, Hewlett-Packard Development Company, L.P.
> This program and the accompanying materials > are licensed and made available under the terms and conditions of the BSD License > @@ -780,14 +780,24 @@ typedef struct { > /// > } EFI_PCI_CAPABILITY_HOTPLUG; > > -#define DEVICE_ID_NOCARE 0xFFFF > +/// > +/// Below macros (till PCI_BAR_NOCHANGE) were used by EfiIncompatiblePciDeviceSupport Protocol. > +/// > +#ifndef DISABLE_NEW_DEPRECATED_INTERFACES > + > +/// > +/// [ATTENTION] These macros are deprecated because they don't match Spec or not defined in Spec. > +/// > +#define DEVICE_ID_NOCARE 0xFFFF ///< Deprecated. Value doesn't match Spec. > +#define PCI_BAR_OLD_ALIGN 0xFFFFFFFFFFFFFFFFULL ///< Deprecated. Value isn't defined in Spec. > +#define PCI_BAR_EVEN_ALIGN 0xFFFFFFFFFFFFFFFEULL ///< Deprecated. Value isn't defined in Spec. > +#define PCI_BAR_SQUAD_ALIGN 0xFFFFFFFFFFFFFFFDULL ///< Deprecated. Value isn't defined in Spec. > +#define PCI_BAR_DQUAD_ALIGN 0xFFFFFFFFFFFFFFFCULL ///< Deprecated. Value isn't defined in Spec. > +#define PCI_BAR_ALL 0xFF ///< Deprecated. Value doesn't match Spec. > +#define PCI_ACPI_UNUSED 0 ///< Deprecated. Macro name is too general. > +#define PCI_BAR_NOCHANGE 0 ///< Deprecated. Macro name is too general. > > -#define PCI_ACPI_UNUSED 0 > -#define PCI_BAR_NOCHANGE 0 > -#define PCI_BAR_OLD_ALIGN 0xFFFFFFFFFFFFFFFFULL > -#define PCI_BAR_EVEN_ALIGN 0xFFFFFFFFFFFFFFFEULL > -#define PCI_BAR_SQUAD_ALIGN 0xFFFFFFFFFFFFFFFDULL > -#define PCI_BAR_DQUAD_ALIGN 0xFFFFFFFFFFFFFFFCULL > +#endif > > #define PCI_BAR_IDX0 0x00 > #define PCI_BAR_IDX1 0x01 > @@ -795,7 +805,6 @@ typedef struct { > #define PCI_BAR_IDX3 0x03 > #define PCI_BAR_IDX4 0x04 > #define PCI_BAR_IDX5 0x05 > -#define PCI_BAR_ALL 0xFF > > /// > /// EFI PCI Option ROM definitions > I didn't try to verify the macros one by one, but I agree that relative to the previous version (*), the patch is now complete (PCI_ACPI_UNUSED and PCI_BAR_NOCHANGE are covered). Acked-by: Laszlo Ersek (*) It's not easy to identify the previous version, because both that one and this one are marked as "[PATCH v4 6/6]". Thanks Laszlo