pci: rename catch-all ID

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 <thomas@monjalon.net>
Reviewed-by: Parav Pandit <parav@nvidia.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>

diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst
index 19cec62..326f3f9 100644 (file)
--- 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 9b8d769..ee7f966 100644 (file)
--- 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 876abdd..3a092bc 100644 (file)
--- 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 a7f541a..9689ca8 100644 (file)
--- 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 f89c7db..a8f8e40 100644 (file)
--- 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)
 
 /**