[dpdk-dev] [PATCH v8 15/21] bus/pci: add device matching field id

[Gaetan Rivet]

The PCI bus can now parse a matching field "id" as follows:

   "bus=pci,id=0000:00:00.0"

           or

   "bus=pci,id=00:00.0"

Signed-off-by: Gaetan Rivet <gaetan.ri...@6wind.com>
---
 drivers/bus/pci/pci_params.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/pci/pci_params.c b/drivers/bus/pci/pci_params.c
index 0fde75803..7630d4845 100644
--- a/drivers/bus/pci/pci_params.c
+++ b/drivers/bus/pci/pci_params.c
@@ -3,6 +3,7 @@
  */
 
 #include <rte_bus.h>
+#include <rte_bus_pci.h>
 #include <rte_dev.h>
 #include <rte_errno.h>
 #include <rte_kvargs.h>
@@ -11,21 +12,45 @@
 #include "private.h"
 
 enum pci_params {
+       RTE_PCI_PARAMS_ID,
        RTE_PCI_PARAMS_MAX,
 };
 
 static const char * const pci_params_keys[] = {
+       [RTE_PCI_PARAMS_ID] = "id",
        [RTE_PCI_PARAMS_MAX] = NULL,
 };
 
 static int
+pci_addr_kv_cmp(const char *key __rte_unused,
+               const char *value,
+               void *_addr2)
+{
+       struct rte_pci_addr _addr1;
+       struct rte_pci_addr *addr1 = &_addr1;
+       struct rte_pci_addr *addr2 = _addr2;
+
+       if (rte_pci_addr_parse(value, addr1))
+               return -1;
+       return -abs(rte_pci_addr_cmp(addr1, addr2));
+}
+
+static int
 pci_dev_match(const struct rte_device *dev,
              const void *_kvlist)
 {
        const struct rte_kvargs *kvlist = _kvlist;
+       const struct rte_pci_device *pdev;
 
-       (void) dev;
-       (void) kvlist;
+       if (kvlist == NULL)
+               /* Empty string matches everything. */
+               return 0;
+       pdev = RTE_DEV_TO_PCI_CONST(dev);
+       /* if any field does not match. */
+       if (rte_kvargs_process(kvlist, "id",
+                              &pci_addr_kv_cmp,
+                              (void *)(intptr_t)&pdev->addr))
+               return 1;
        return 0;
 }
 
-- 
2.11.0