[dpdk-dev] [PATCH v2 10/11] ethdev: Use embedded rte_device to detach driver

[Gaetan Rivet]

From: Jan Blunck <jblu...@infradead.org>

Signed-off-by: Jan Blunck <jblu...@infradead.org>
Signed-off-by: Gaetan Rivet <gaetan.ri...@6wind.com>
---
 lib/librte_eal/bsdapp/eal/rte_eal_version.map |  1 +
 lib/librte_eal/common/eal_common_dev.c        | 43 ++++++++++++++++-----------
 lib/librte_eal/common/include/rte_dev.h       | 11 +++++++
 lib/librte_ether/rte_ethdev.c                 |  3 +-
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map 
b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
index 21640d6..150b0f7 100644
--- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map
+++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map
@@ -162,6 +162,7 @@ DPDK_17.02 {
 DPDK_17.05 {
        global:
 
+       rte_eal_device_detach;
        rte_bus_find;
        rte_bus_find_by_device;
        rte_bus_find_device;
diff --git a/lib/librte_eal/common/eal_common_dev.c 
b/lib/librte_eal/common/eal_common_dev.c
index 7508b70..968c66e 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -100,6 +100,30 @@ int rte_eal_dev_attach(const char *name, const char 
*devargs)
        return ret;
 }
 
+int rte_eal_device_detach(struct rte_device *dev)
+{
+       struct rte_bus *bus;
+       int ret;
+
+       bus = rte_bus_find_by_device(dev);
+       if (!bus) {
+               RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
+                       dev->name);
+               return -EINVAL;
+       }
+
+       if (!bus->unplug) {
+               RTE_LOG(ERR, EAL, "Bus function not supported\n");
+               return -ENOTSUP;
+       }
+
+       ret = bus->unplug(dev->devargs);
+       if (ret)
+               RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
+                       dev->name);
+       return ret;
+}
+
 static int cmp_dev_name(const struct rte_device *dev, const void *_name)
 {
        const char *name = _name;
@@ -110,8 +134,6 @@ static int cmp_dev_name(const struct rte_device *dev, const 
void *_name)
 int rte_eal_dev_detach(const char *name)
 {
        struct rte_device *dev;
-       struct rte_bus *bus;
-       int ret;
 
        if (name == NULL) {
                RTE_LOG(ERR, EAL, "Invalid device provided.\n");
@@ -124,20 +146,5 @@ int rte_eal_dev_detach(const char *name)
                return -EINVAL;
        }
 
-       bus = rte_bus_find_by_device(dev);
-       if (!bus) {
-               RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n", name);
-               return -EINVAL;
-       }
-
-       if (!bus->unplug) {
-               RTE_LOG(ERR, EAL, "Bus function not supported\n");
-               return -ENOTSUP;
-       }
-
-       ret = bus->unplug(dev->devargs);
-       if (ret)
-               RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
-                       name);
-       return ret;
+       return rte_eal_device_detach(dev);
 }
diff --git a/lib/librte_eal/common/include/rte_dev.h 
b/lib/librte_eal/common/include/rte_dev.h
index f017814..c530797 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -123,6 +123,17 @@ struct rte_mem_resource {
        void *addr;         /**< Virtual address, NULL when not mapped. */
 };
 
+/* FIXME: Forward declare */
+struct rte_device;
+
+/**
+ * Unplug the device from the device driver.
+ *
+ * @param dev
+ *   A pointer to a rte_device structure.
+ */
+int rte_eal_device_detach(struct rte_device *dev);
+
 /**
  * A structure describing a device driver.
  */
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 83898a8..ff4f5ab 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -440,7 +440,8 @@ rte_eth_dev_detach(uint8_t port_id, char *name)
 
        snprintf(name, sizeof(rte_eth_devices[port_id].data->name),
                 "%s", rte_eth_devices[port_id].data->name);
-       ret = rte_eal_dev_detach(name);
+
+       ret = rte_eal_device_detach(rte_eth_devices[0].device);
        if (ret < 0)
                goto err;
 
-- 
2.1.4