ethdev: use device handle to detach

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

diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index 555e0d9..ede68e4 100644 (file)
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -37,6 +37,7 @@
 #include <inttypes.h>
 #include <sys/queue.h>
 
+#include <rte_bus.h>
 #include <rte_dev.h>
 #include <rte_devargs.h>
 #include <rte_debug.h>
@@ -45,58 +46,23 @@
 
 #include "eal_private.h"
 
-/** Global list of device drivers. */
-static struct rte_driver_list dev_driver_list =
-       TAILQ_HEAD_INITIALIZER(dev_driver_list);
-
-/* register a driver */
-void
-rte_eal_driver_register(struct rte_driver *driver)
+static int cmp_detached_dev_name(const struct rte_device *dev,
+       const void *_name)
 {
-       TAILQ_INSERT_TAIL(&dev_driver_list, driver, next);
-}
+       const char *name = _name;
 
-/* unregister a driver */
-void
-rte_eal_driver_unregister(struct rte_driver *driver)
-{
-       TAILQ_REMOVE(&dev_driver_list, driver, next);
+       /* skip attached devices */
+       if (dev->driver != NULL)
+               return 1;
+
+       return strcmp(dev->name, name);
 }
 
-int
-rte_eal_dev_init(void)
+static int cmp_dev_name(const struct rte_device *dev, const void *_name)
 {
-       struct rte_devargs *devargs;
-       struct rte_driver *driver;
-
-       /*
-        * Note that the dev_driver_list is populated here
-        * from calls made to rte_eal_driver_register from constructor functions
-        * embedded into PMD modules via the DRIVER_REGISTER_VDEV macro
-        */
-
-       /* call the init function for each virtual device */
-       TAILQ_FOREACH(devargs, &devargs_list, next) {
-
-               if (devargs->type != RTE_DEVTYPE_VIRTUAL)
-                       continue;
-
-               if (rte_eal_vdev_init(devargs->virt.drv_name,
-                                       devargs->args)) {
-                       RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
-                                       devargs->virt.drv_name);
-                       return -1;
-               }
-       }
+       const char *name = _name;
 
-       /* Once the vdevs are initalized, start calling all the pdev drivers */
-       TAILQ_FOREACH(driver, &dev_driver_list, next) {
-               if (driver->type != PMD_PDEV)
-                       continue;
-               /* PDEV drivers don't get passed any parameters */
-               driver->init(NULL, NULL);
-       }
-       return 0;
+       return strcmp(dev->name, name);
 }
 
 int rte_eal_dev_attach(const char *name, const char *devargs)
@@ -109,11 +75,11 @@ int rte_eal_dev_attach(const char *name, const char *devargs)
        }
 
        if (eal_parse_pci_DomBDF(name, &addr) == 0) {
-               if (rte_eal_pci_probe_one(&addr) < 0)
+               if (rte_pci_probe_one(&addr) < 0)
                        goto err;
 
        } else {
-               if (rte_eal_vdev_init(name, devargs))
+               if (rte_vdev_init(name, devargs))
                        goto err;
        }
 
@@ -124,25 +90,99 @@ err:
        return -EINVAL;
 }
 
-int rte_eal_dev_detach(const char *name)
+int rte_eal_dev_detach(struct rte_device *dev)
 {
-       struct rte_pci_addr addr;
+       struct rte_bus *bus;
+       int ret;
 
-       if (name == NULL) {
+       if (dev == NULL) {
                RTE_LOG(ERR, EAL, "Invalid device provided.\n");
                return -EINVAL;
        }
 
-       if (eal_parse_pci_DomBDF(name, &addr) == 0) {
-               if (rte_eal_pci_detach(&addr) < 0)
-                       goto err;
-       } else {
-               if (rte_eal_vdev_uninit(name))
-                       goto err;
+       bus = rte_bus_find_by_device(dev);
+       if (bus == NULL) {
+               RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
+                       dev->name);
+               return -EINVAL;
        }
-       return 0;
 
-err:
-       RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n", name);
-       return -EINVAL;
+       if (bus->unplug == NULL) {
+               RTE_LOG(ERR, EAL, "Bus function not supported\n");
+               return -ENOTSUP;
+       }
+
+       ret = bus->unplug(dev);
+       if (ret)
+               RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
+                       dev->name);
+       return ret;
+}
+
+int rte_eal_hotplug_add(const char *busname, const char *devname,
+                       const char *devargs)
+{
+       struct rte_bus *bus;
+       struct rte_device *dev;
+       int ret;
+
+       bus = rte_bus_find_by_name(busname);
+       if (bus == NULL) {
+               RTE_LOG(ERR, EAL, "Cannot find bus (%s)\n", busname);
+               return -ENOENT;
+       }
+
+       if (bus->plug == NULL) {
+               RTE_LOG(ERR, EAL, "Function plug not supported by bus (%s)\n",
+                       bus->name);
+               return -ENOTSUP;
+       }
+
+       ret = bus->scan();
+       if (ret)
+               return ret;
+
+       dev = bus->find_device(NULL, cmp_detached_dev_name, devname);
+       if (dev == NULL) {
+               RTE_LOG(ERR, EAL, "Cannot find unplugged device (%s)\n",
+                       devname);
+               return -EINVAL;
+       }
+
+       ret = bus->plug(dev, devargs);
+       if (ret)
+               RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
+                       dev->name);
+       return ret;
+}
+
+int rte_eal_hotplug_remove(const char *busname, const char *devname)
+{
+       struct rte_bus *bus;
+       struct rte_device *dev;
+       int ret;
+
+       bus = rte_bus_find_by_name(busname);
+       if (bus == NULL) {
+               RTE_LOG(ERR, EAL, "Cannot find bus (%s)\n", busname);
+               return -ENOENT;
+       }
+
+       if (bus->unplug == NULL) {
+               RTE_LOG(ERR, EAL, "Function unplug not supported by bus (%s)\n",
+                       bus->name);
+               return -ENOTSUP;
+       }
+
+       dev = bus->find_device(NULL, cmp_dev_name, devname);
+       if (dev == NULL) {
+               RTE_LOG(ERR, EAL, "Cannot find plugged device (%s)\n", devname);
+               return -EINVAL;
+       }
+
+       ret = bus->unplug(dev);
+       if (ret)
+               RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
+                       dev->name);
+       return ret;
 }