[dpdk-dev,v7,15/15] ethdev: Use embedded rte_device to detach driver
Checks
Commit Message
Signed-off-by: Jan Blunck <jblunck@infradead.org>
---
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 | 8 +++++
lib/librte_ether/rte_ethdev.c | 3 +-
4 files changed, 36 insertions(+), 19 deletions(-)
Comments
29/06/2017 20:22, Jan Blunck:
> --- a/lib/librte_eal/common/eal_common_dev.c
> +++ b/lib/librte_eal/common/eal_common_dev.c
> +int rte_eal_device_detach(struct rte_device *dev)
[...]
> int rte_eal_dev_detach(const char *name)
I would be in favor of breaking the API without notice,
and keep the name rte_eal_dev_detach for the function
taking a rte_device as parameter.
This function was introduced in 16.11 and has probably never been used,
except in ethdev and testpmd. Legacy apps probably use rte_eth_dev_detach.
@@ -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;
@@ -81,6 +81,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);
+ 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;
@@ -91,8 +115,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");
@@ -105,22 +127,7 @@ 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);
- if (ret)
- RTE_LOG(ERR, EAL, "Driver cannot detach the device (%s)\n",
- name);
- return ret;
+ return rte_eal_device_detach(dev);
}
int rte_eal_hotplug_add(const char *busname, const char *devname,
@@ -192,6 +192,14 @@ int rte_eal_dev_attach(const char *name, const char *devargs);
int rte_eal_dev_detach(const char *name);
/**
+ * 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);
+
+/**
* Hotplug add a given device to a specific bus.
*
* @param busname
@@ -439,7 +439,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;