From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 073D2A034F; Tue, 6 Apr 2021 12:28:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E1A73141021; Tue, 6 Apr 2021 12:28:25 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mails.dpdk.org (Postfix) with ESMTP id B2497140EEB for ; Tue, 6 Apr 2021 12:28:22 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 44DBB5C00FE; Tue, 6 Apr 2021 06:28:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Tue, 06 Apr 2021 06:28:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=PJwza5McjWNUy HjXBiDoNiBn+djryuqP/zl7xXUgunM=; b=f7KTKySGM2jru4ZQ8NTUu2h48s7bR 8uzmHQJz/6QlBZFrk534FHk0gTITiq/wIUVz4fw8++k93pWtYF15y6okdHryRPGh 6SpTvP8sFLXv18rMcEwcqqTgToDAgHemcZIUljAha1571sqbBstHJcgjfFoCvume RNn7fnwCanzcJgng/AHZciAuIVzzSf3KDMwvOo/7nduoMZEkzsjHMEmtVwP2CRdN qWgjqnOz1xBlFCvp+VW+CAn55dIr5uG39NKxYJaNoY+CNGmbjqj4QS95T27FmBYb 2Jp9v8U3kJ/zR0XgdtrFwmkd+mfKVGT1WlRFd+dFnzY0aXGmwVH4nQ2CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=PJwza5McjWNUyHjXBiDoNiBn+djryuqP/zl7xXUgunM=; b=E7UJZrYW ePv5eD4bLnZcT4kz1kLEkw25wJ1Uwq/YH0yAWuHMjw7Dwszc++A+89eHqiu7oPmc riu1GI0dQsDuDk+hmuVSvex4aT9U1f5jMEul2WVLIImyVsKSxSt017d05ISy1qBU DcWJosjeu/9vB4s5bV4dMC0xM3rhO8olBCFN8kHcEkczbnzBIutozNafdf3YMgA3 HlBq/JqPQdvB4e2SkUIENZ/Lawxh5Sw6CWa/lKkMrydAnAl2PuBnkZt7B38WQngg RX3/2/J0cQrGgK42kiH2BjhIF0XwMwEPEKEp+btYK0m5wO11nKxe4rpjS7LnRnAx +bdx/l8CEcuUxg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudejgedgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecugg ftrfgrthhtvghrnhepvdehgfeivdejgedtveehfefhteelfefgieevgfffveefjeegtdfg uedthedtgeevnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghl ohhnrdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id AD3C6240054; Tue, 6 Apr 2021 06:28:20 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: Parav Pandit , David Marchand , Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Gaetan Rivet Date: Tue, 6 Apr 2021 12:28:15 +0200 Message-Id: <20210406102816.1689871-2-thomas@monjalon.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210406102816.1689871-1-thomas@monjalon.net> References: <20210331223423.2089467-1-thomas@monjalon.net> <20210406102816.1689871-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 1/2] pci: rename catch-all ID X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The name of the constant PCI_ANY_ID was missing RTE_ prefix. It is renamed, and the old name becomes a deprecated alias. While renaming, the duplicate definitions in rte_bus_pci.h are removed to keep only those in rte_pci.h. Note: rte_pci.h is included in rte_bus_pci.h Signed-off-by: Thomas Monjalon Reviewed-by: Parav Pandit Reviewed-by: David Marchand --- doc/guides/rel_notes/release_21_05.rst | 3 +++ drivers/bus/pci/pci_common.c | 8 ++++---- drivers/bus/pci/rte_bus_pci.h | 12 ++++-------- drivers/common/mlx5/mlx5_common_pci.c | 8 ++++---- lib/librte_pci/rte_pci.h | 12 +++++++----- 5 files changed, 22 insertions(+), 21 deletions(-) diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst index 19cec62c73..61b6575949 100644 --- a/doc/guides/rel_notes/release_21_05.rst +++ b/doc/guides/rel_notes/release_21_05.rst @@ -159,6 +159,9 @@ API Changes from ``rte_thread_tls_*`` to ``rte_thread_*`` to avoid naming redundancy and confusion with the transport layer security term. +* pci: The value ``PCI_ANY_ID`` is marked as deprecated, + and can be replaced with ``RTE_PCI_ANY_ID``. + ABI Changes ----------- diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 9b8d769287..ee7f966358 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -133,18 +133,18 @@ rte_pci_match(const struct rte_pci_driver *pci_drv, id_table++) { /* check if device's identifiers match the driver's ones */ if (id_table->vendor_id != pci_dev->id.vendor_id && - id_table->vendor_id != PCI_ANY_ID) + id_table->vendor_id != RTE_PCI_ANY_ID) continue; if (id_table->device_id != pci_dev->id.device_id && - id_table->device_id != PCI_ANY_ID) + id_table->device_id != RTE_PCI_ANY_ID) continue; if (id_table->subsystem_vendor_id != pci_dev->id.subsystem_vendor_id && - id_table->subsystem_vendor_id != PCI_ANY_ID) + id_table->subsystem_vendor_id != RTE_PCI_ANY_ID) continue; if (id_table->subsystem_device_id != pci_dev->id.subsystem_device_id && - id_table->subsystem_device_id != PCI_ANY_ID) + id_table->subsystem_device_id != RTE_PCI_ANY_ID) continue; if (id_table->class_id != pci_dev->id.class_id && id_table->class_id != RTE_CLASS_ANY_ID) diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h index 876abddefb..3a092bc6d5 100644 --- a/drivers/bus/pci/rte_bus_pci.h +++ b/drivers/bus/pci/rte_bus_pci.h @@ -91,26 +91,22 @@ struct rte_pci_device { #define RTE_ETH_DEV_TO_PCI(eth_dev) RTE_DEV_TO_PCI((eth_dev)->device) -/** Any PCI device identifier (vendor, device, ...) */ -#define PCI_ANY_ID (0xffff) -#define RTE_CLASS_ANY_ID (0xffffff) - #ifdef __cplusplus /** C++ macro used to help building up tables of device IDs */ #define RTE_PCI_DEVICE(vend, dev) \ RTE_CLASS_ANY_ID, \ (vend), \ (dev), \ - PCI_ANY_ID, \ - PCI_ANY_ID + RTE_PCI_ANY_ID, \ + RTE_PCI_ANY_ID #else /** Macro used to help building up tables of device IDs */ #define RTE_PCI_DEVICE(vend, dev) \ .class_id = RTE_CLASS_ANY_ID, \ .vendor_id = (vend), \ .device_id = (dev), \ - .subsystem_vendor_id = PCI_ANY_ID, \ - .subsystem_device_id = PCI_ANY_ID + .subsystem_vendor_id = RTE_PCI_ANY_ID, \ + .subsystem_device_id = RTE_PCI_ANY_ID #endif /** diff --git a/drivers/common/mlx5/mlx5_common_pci.c b/drivers/common/mlx5/mlx5_common_pci.c index a7f541a90c..9689ca86fc 100644 --- a/drivers/common/mlx5/mlx5_common_pci.c +++ b/drivers/common/mlx5/mlx5_common_pci.c @@ -142,18 +142,18 @@ mlx5_bus_match(const struct mlx5_pci_driver *drv, id_table++) { /* Check if device's ids match the class driver's ids. */ if (id_table->vendor_id != pci_dev->id.vendor_id && - id_table->vendor_id != PCI_ANY_ID) + id_table->vendor_id != RTE_PCI_ANY_ID) continue; if (id_table->device_id != pci_dev->id.device_id && - id_table->device_id != PCI_ANY_ID) + id_table->device_id != RTE_PCI_ANY_ID) continue; if (id_table->subsystem_vendor_id != pci_dev->id.subsystem_vendor_id && - id_table->subsystem_vendor_id != PCI_ANY_ID) + id_table->subsystem_vendor_id != RTE_PCI_ANY_ID) continue; if (id_table->subsystem_device_id != pci_dev->id.subsystem_device_id && - id_table->subsystem_device_id != PCI_ANY_ID) + id_table->subsystem_device_id != RTE_PCI_ANY_ID) continue; if (id_table->class_id != pci_dev->id.class_id && id_table->class_id != RTE_CLASS_ANY_ID) diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h index f89c7dbbea..a8f8e404a9 100644 --- a/lib/librte_pci/rte_pci.h +++ b/lib/librte_pci/rte_pci.h @@ -78,10 +78,10 @@ extern "C" { */ struct rte_pci_id { uint32_t class_id; /**< Class ID or RTE_CLASS_ANY_ID. */ - uint16_t vendor_id; /**< Vendor ID or PCI_ANY_ID. */ - uint16_t device_id; /**< Device ID or PCI_ANY_ID. */ - uint16_t subsystem_vendor_id; /**< Subsystem vendor ID or PCI_ANY_ID. */ - uint16_t subsystem_device_id; /**< Subsystem device ID or PCI_ANY_ID. */ + uint16_t vendor_id; /**< Vendor ID or RTE_PCI_ANY_ID. */ + uint16_t device_id; /**< Device ID or RTE_PCI_ANY_ID. */ + uint16_t subsystem_vendor_id; /**< Subsystem vendor ID or RTE_PCI_ANY_ID. */ + uint16_t subsystem_device_id; /**< Subsystem device ID or RTE_PCI_ANY_ID. */ }; /** @@ -95,7 +95,9 @@ struct rte_pci_addr { }; /** Any PCI device identifier (vendor, device, ...) */ -#define PCI_ANY_ID (0xffff) +#define RTE_PCI_ANY_ID (0xffff) +/** @deprecated Replaced with RTE_PCI_ANY_ID */ +#define PCI_ANY_ID RTE_DEPRECATED(PCI_ANY_ID) RTE_PCI_ANY_ID #define RTE_CLASS_ANY_ID (0xffffff) /** -- 2.31.1