devargs: make device representation generic

[dpdk.git] / lib / librte_eal / common / eal_common_pci.c

diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index 7ed259b..8bff3a8 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -74,12 +74,15 @@ const char *pci_get_sysfs_path(void)
 static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev)
 {
        struct rte_devargs *devargs;
+       struct rte_pci_addr addr;
+       struct rte_bus *pbus;
 
+       pbus = rte_bus_find_by_name("pci");
        TAILQ_FOREACH(devargs, &devargs_list, next) {
-               if (devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI &&
-                       devargs->type != RTE_DEVTYPE_WHITELISTED_PCI)
+               if (devargs->bus != pbus)
                        continue;
-               if (!rte_eal_compare_pci_addr(&dev->addr, &devargs->pci.addr))
+               devargs->bus->parse(devargs->name, &addr);
+               if (!rte_eal_compare_pci_addr(&dev->addr, &addr))
                        return devargs;
        }
        return NULL;
@@ -300,7 +303,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
 
 /*
  * Find the pci device specified by pci address, then invoke probe function of
- * the driver of the devive.
+ * the driver of the device.
  */
 int
 rte_pci_probe_one(const struct rte_pci_addr *addr)
@@ -448,6 +451,20 @@ rte_pci_dump(FILE *f)
        }
 }
 
+static int
+pci_parse(const char *name, void *addr)
+{
+       struct rte_pci_addr *out = addr;
+       struct rte_pci_addr pci_addr;
+       bool parse;
+
+       parse = (eal_parse_pci_BDF(name, &pci_addr) == 0 ||
+                eal_parse_pci_DomBDF(name, &pci_addr) == 0);
+       if (parse && addr != NULL)
+               *out = pci_addr;
+       return parse == false;
+}
+
 /* register a driver */
 void
 rte_pci_register(struct rte_pci_driver *driver)
@@ -542,9 +559,10 @@ struct rte_pci_bus rte_pci_bus = {
                .find_device = pci_find_device,
                .plug = pci_plug,
                .unplug = pci_unplug,
+               .parse = pci_parse,
        },
        .device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
        .driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
 };
 
-RTE_REGISTER_BUS(PCI_BUS_NAME, rte_pci_bus.bus);
+RTE_REGISTER_BUS(pci, rte_pci_bus.bus);