From: "Kinney, Michael D" <michael.d.kinney@intel.com>
To: "Ni, Ruiyu" <ruiyu.ni@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>,
"Kinney, Michael D" <michael.d.kinney@intel.com>
Cc: "Tian, Feng" <feng.tian@intel.com>, "Fan, Jeff" <jeff.fan@intel.com>
Subject: Re: [PATCH v2 3/6] MdeModulePkg/IncompatiblePciDevice: Do not use deprecated macros
Date: Mon, 6 Feb 2017 17:40:42 +0000 [thread overview]
Message-ID: <E92EE9817A31E24EB0585FDF735412F5648B013D@ORSMSX113.amr.corp.intel.com> (raw)
In-Reply-To: <20170206060059.595976-4-ruiyu.ni@intel.com>
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 <feng.tian@intel.com>; Fan, Jeff <jeff.fan@intel.com>
> 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 <ruiyu.ni@intel.com>
> Cc: Jeff Fan <jeff.fan@intel.com>
> Cc: Feng Tian <feng.tian@intel.com>
> ---
> .../IncompatiblePciDeviceSupport.c | 108 ++++++++++-----------
> 1 file changed, 53 insertions(+), 55 deletions(-)
>
> diff --git
> a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> index 3d581b6..5a6a052 100644
> ---
> a/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c
> +++
> b/MdeModulePkg/Bus/Pci/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.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.<BR>
> +Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
> 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[] = {
> // 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 != DEVICE_ID_NOCARE) {
> + if (Header->VendorId != (UINT64)-1) {
> if (Header->VendorId != VendorId) {
> continue;
> }
> }
>
> - if (Header->DeviceId != DEVICE_ID_NOCARE) {
> + if (Header->DeviceId != (UINT64)-1) {
> if (DeviceId != Header->DeviceId) {
> continue;
> }
> }
>
> - if (Header->RevisionId != DEVICE_ID_NOCARE) {
> + if (Header->RevisionId != (UINT64)-1) {
> if (RevisionId != Header->RevisionId) {
> continue;
> }
> }
>
> - if (Header->SubsystemVendorId != DEVICE_ID_NOCARE) {
> + if (Header->SubsystemVendorId != (UINT64)-1) {
> if (SubsystemVendorId != Header->SubsystemVendorId) {
> continue;
> }
> }
>
> - if (Header->SubsystemDeviceId != DEVICE_ID_NOCARE) {
> + if (Header->SubsystemDeviceId != (UINT64)-1) {
> if (SubsystemDeviceId != 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
next prev parent reply other threads:[~2017-02-06 17:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-06 6:00 [PATCH v2 0/6] Fix PciBus to accept Spec values as BarIndex and Alignment Ruiyu Ni
2017-02-06 6:00 ` [PATCH v2 1/6] MdeModulePkg/PciSioSerialDxe: Use MAX_UINT8 instead of PCI_BAR_ALL Ruiyu Ni
2017-02-08 7:44 ` Tian, Feng
2017-02-06 6:00 ` [PATCH v2 2/6] MdeModulePkg/PciBus: Accept Spec values as BarIndex and Alignment Ruiyu Ni
2017-02-06 8:36 ` Tian, Feng
2017-02-06 6:00 ` [PATCH v2 3/6] MdeModulePkg/IncompatiblePciDevice: Do not use deprecated macros Ruiyu Ni
2017-02-06 17:40 ` Kinney, Michael D [this message]
2017-02-06 17:55 ` Kinney, Michael D
2017-02-07 3:09 ` Ni, Ruiyu
2017-02-06 6:00 ` [PATCH v2 4/6] MdeModulePkg/IncompatiblePci: Use -1 to match any IDs Ruiyu Ni
2017-02-06 6:00 ` [PATCH v2 5/6] OvmfPkg/IncompatiblePci: Do not use deprecated macros Ruiyu Ni
2017-02-06 6:00 ` [PATCH v2 6/6] MdePkg/Pci22.h: Deprecate out-of-Spec IncompatiblePciDevice macros Ruiyu Ni
2017-02-06 8:18 ` Gao, Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E92EE9817A31E24EB0585FDF735412F5648B013D@ORSMSX113.amr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox