bus/pci: use given name as generic name

[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 1d3eaed..45e697e 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -74,17 +74,43 @@ 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;
 }
 
+void
+pci_name_set(struct rte_pci_device *dev)
+{
+       struct rte_devargs *devargs;
+
+       /* Each device has its internal, canonical name set. */
+       rte_pci_device_name(&dev->addr,
+                       dev->name, sizeof(dev->name));
+       devargs = pci_devargs_lookup(dev);
+       dev->device.devargs = devargs;
+       /* In blacklist mode, if the device is not blacklisted, no
+        * rte_devargs exists for it.
+        */
+       if (devargs != NULL)
+               /* If an rte_devargs exists, the generic rte_device uses the
+                * given name as its namea
+                */
+               dev->device.name = dev->device.devargs->name;
+       else
+               /* Otherwise, it uses the internal, canonical form. */
+               dev->device.name = dev->name;
+}
+
 /* map a particular resource from a file */
 void *
 pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size,
@@ -195,7 +221,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
        /* no initialization when blacklisted, return without error */
        if (dev->device.devargs != NULL &&
                dev->device.devargs->type ==
-                       RTE_DEVTYPE_BLACKLISTED_PCI) {
+                       RTE_DEVTYPE_BLACKLISTED) {
                RTE_LOG(INFO, EAL, "  Device is blacklisted, not"
                        " initializing\n");
                return 1;
@@ -387,22 +413,18 @@ rte_pci_probe(void)
        int probe_all = 0;
        int ret = 0;
 
-       if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) == 0)
+       if (rte_pci_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST)
                probe_all = 1;
 
        FOREACH_DEVICE_ON_PCIBUS(dev) {
                probed++;
 
-               /* set devargs in PCI structure */
-               devargs = pci_devargs_lookup(dev);
-               if (devargs != NULL)
-                       dev->device.devargs = devargs;
-
+               devargs = dev->device.devargs;
                /* probe all or only whitelisted devices */
                if (probe_all)
                        ret = pci_probe_all_drivers(dev);
                else if (devargs != NULL &&
-                       devargs->type == RTE_DEVTYPE_WHITELISTED_PCI)
+                       devargs->type == RTE_DEVTYPE_WHITELISTED)
                        ret = pci_probe_all_drivers(dev);
                if (ret < 0) {
                        RTE_LOG(ERR, EAL, "Requested device " PCI_PRI_FMT