New upstream version 17.08

[deb_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 8f9baf8..08bec2d 100644 (file)
--- a/lib/librte_eal/common/eal_common_bus.c
+++ b/lib/librte_eal/common/eal_common_bus.c
@@ -1,8 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2016 NXP
- *   All rights reserved.
+ *   Copyright 2016 NXP.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -50,6 +49,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);
@@ -89,7 +91,7 @@ rte_bus_probe(void)
        struct rte_bus *bus, *vbus = NULL;
 
        TAILQ_FOREACH(bus, &rte_bus_list, next) {
-               if (!strcmp(bus->name, "virtual")) {
+               if (!strcmp(bus->name, "vdev")) {
                        vbus = bus;
                        continue;
                }
@@ -145,3 +147,78 @@ 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);
+}
+
+static int
+bus_can_parse(const struct rte_bus *bus, const void *_name)
+{
+       const char *name = _name;
+
+       return !(bus->parse && bus->parse(name, NULL) == 0);
+}
+
+struct rte_bus *
+rte_bus_find_by_device_name(const char *str)
+{
+       char name[RTE_DEV_NAME_MAX_LEN];
+       char *c;
+
+       snprintf(name, sizeof(name), "%s", str);
+       c = strchr(name, ',');
+       if (c != NULL)
+               c[0] = '\0';
+       return rte_bus_find(NULL, bus_can_parse, name);
+}