bus: fix driver registration

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

diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/librte_eal/common/eal_common_bus.c
index 4638e78..96eb4fd 100644 (file)
--- a/lib/librte_eal/common/eal_common_bus.c
+++ b/lib/librte_eal/common/eal_common_bus.c
@@ -50,6 +50,9 @@ rte_bus_register(struct rte_bus *bus)
        /* A bus should mandatorily have the scan implemented */
        RTE_VERIFY(bus->scan);
        RTE_VERIFY(bus->probe);
+       RTE_VERIFY(bus->find_device);
+       /* Buses supporting driver plug also require unplug. */
+       RTE_VERIFY(!bus->plug || bus->unplug);
 
        TAILQ_INSERT_TAIL(&rte_bus_list, bus, next);
        RTE_LOG(DEBUG, EAL, "Registered [%s] bus.\n", bus->name);
@@ -86,9 +89,14 @@ int
 rte_bus_probe(void)
 {
        int ret;
-       struct rte_bus *bus;
+       struct rte_bus *bus, *vbus = NULL;
 
        TAILQ_FOREACH(bus, &rte_bus_list, next) {
+               if (!strcmp(bus->name, "vdev")) {
+                       vbus = bus;
+                       continue;
+               }
+
                ret = bus->probe();
                if (ret) {
                        RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
@@ -97,6 +105,15 @@ rte_bus_probe(void)
                }
        }
 
+       if (vbus) {
+               ret = vbus->probe();
+               if (ret) {
+                       RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
+                               vbus->name);
+                       return ret;
+               }
+       }
+
        return 0;
 }
 
@@ -131,3 +148,57 @@ rte_bus_dump(FILE *f)
                }
        }
 }
+
+struct rte_bus *
+rte_bus_find(const struct rte_bus *start, rte_bus_cmp_t cmp,
+            const void *data)
+{
+       struct rte_bus *bus = NULL;
+
+       TAILQ_FOREACH(bus, &rte_bus_list, next) {
+               if (start && bus == start) {
+                       start = NULL; /* starting point found */
+                       continue;
+               }
+               if (cmp(bus, data) == 0)
+                       break;
+       }
+       return bus;
+}
+
+static int
+cmp_rte_device(const struct rte_device *dev1, const void *_dev2)
+{
+       const struct rte_device *dev2 = _dev2;
+
+       return dev1 != dev2;
+}
+
+static int
+bus_find_device(const struct rte_bus *bus, const void *_dev)
+{
+       struct rte_device *dev;
+
+       dev = bus->find_device(NULL, cmp_rte_device, _dev);
+       return dev == NULL;
+}
+
+struct rte_bus *
+rte_bus_find_by_device(const struct rte_device *dev)
+{
+       return rte_bus_find(NULL, bus_find_device, (const void *)dev);
+}
+
+static int
+cmp_bus_name(const struct rte_bus *bus, const void *_name)
+{
+       const char *name = _name;
+
+       return strcmp(bus->name, name);
+}
+
+struct rte_bus *
+rte_bus_find_by_name(const char *busname)
+{
+       return rte_bus_find(NULL, cmp_bus_name, (const void *)busname);
+}