DPDK patches and discussions
 help / color / mirror / Atom feed
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Jan Blunck <jblunck@infradead.org>,
	Gaetan Rivet <gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v2 10/11] ethdev: Use embedded rte_device to detach driver
Date: Wed, 31 May 2017 15:17:55 +0200	[thread overview]
Message-ID: <3e6830ce1bd72a5b8d6abac2f8512cf0c8fa8005.1496235017.git.gaetan.rivet@6wind.com> (raw)
In-Reply-To: <cover.1496235017.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1496235017.git.gaetan.rivet@6wind.com>

From: Jan Blunck <jblunck@infradead.org>

Signed-off-by: Jan Blunck <jblunck@infradead.org>
Signed-off-by: Gaetan Rivet <gaetan.rivet@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

  parent reply	other threads:[~2017-05-31 13:18 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-24 15:04 [dpdk-dev] [PATCH 0/9] bus: attach / detach API Gaetan Rivet
2017-05-24 15:04 ` [dpdk-dev] [PATCH 1/9] bus: add bus iterator to find a particular bus Gaetan Rivet
2017-05-24 15:04 ` [dpdk-dev] [PATCH 2/9] bus: add device iterator Gaetan Rivet
2017-05-24 15:04 ` [dpdk-dev] [PATCH 3/9] bus: add helper to find bus for a particular device Gaetan Rivet
2017-05-24 15:04 ` [dpdk-dev] [PATCH 4/9] bus: add bus helper iterator to find " Gaetan Rivet
2017-05-24 15:04 ` [dpdk-dev] [PATCH 5/9] bus: introduce attach/detach functionality Gaetan Rivet
2017-05-24 15:04 ` [dpdk-dev] [PATCH 6/9] vdev: implement find_device bus operation Gaetan Rivet
2017-05-24 15:04 ` [dpdk-dev] [PATCH 7/9] vdev: implement detach " Gaetan Rivet
2017-05-24 15:05 ` [dpdk-dev] [PATCH 8/9] eal: make virtual driver probe and remove take rte_vdev_device Gaetan Rivet
2017-05-24 15:05 ` [dpdk-dev] [PATCH 9/9] ethdev: Use embedded rte_device to detach driver Gaetan Rivet
2017-05-31 13:17 ` [dpdk-dev] [PATCH v2 00/11] bus: attach / detach API Gaetan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 01/11] bus: add bus iterator to find a particular bus Gaetan Rivet
2017-06-07  7:06     ` Shreyansh Jain
2017-06-07 13:27       ` Gaëtan Rivet
2017-06-07 16:55         ` Jan Blunck
2017-06-08  4:34         ` Shreyansh Jain
2017-06-08  8:05           ` Gaëtan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 02/11] bus: add device iterator Gaetan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 03/11] bus: add helper to find bus for a particular device Gaetan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 04/11] bus: add bus helper iterator to find " Gaetan Rivet
2017-06-07 16:41     ` Jan Blunck
2017-06-07 20:12       ` Gaëtan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 05/11] bus: introduce hotplug functionality Gaetan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 06/11] vdev: implement find_device bus operation Gaetan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 07/11] vdev: implement hotplug functionality Gaetan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 08/11] vdev: implement unplug bus operation Gaetan Rivet
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 09/11] eal: make virtual driver probe and remove take rte_vdev_device Gaetan Rivet
2017-05-31 13:17   ` Gaetan Rivet [this message]
2017-05-31 13:17   ` [dpdk-dev] [PATCH v2 11/11] net/ring: fix dev handle in eth_dev Gaetan Rivet
2017-05-31 15:34   ` [dpdk-dev] [PATCH v2 00/11] bus: attach / detach API Stephen Hemminger
2017-06-26  0:27     ` Gaëtan Rivet
2017-06-07 23:53   ` [dpdk-dev] [PATCH v3 00/10] " Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 01/10] bus: add bus iterator to find a particular bus Gaetan Rivet
2017-06-10  8:58       ` Jan Blunck
2017-06-11 19:59         ` Gaëtan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 02/10] bus: add device iterator Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 03/10] bus: add helper to find bus for a particular device Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 04/10] bus: add bus helper iterator to find " Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 05/10] bus: introduce hotplug functionality Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 06/10] vdev: implement find_device bus operation Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 07/10] vdev: implement hotplug functionality Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 08/10] eal: make virtual driver probe and remove take rte_vdev_device Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 09/10] ethdev: use embedded rte_device to detach driver Gaetan Rivet
2017-06-07 23:53     ` [dpdk-dev] [PATCH v3 10/10] net/ring: fix dev handle in eth_dev Gaetan Rivet
2017-06-20 23:29     ` [dpdk-dev] [PATCH v4 0/9] bus: attach / detach API Gaetan Rivet
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 1/9] bus: add bus iterator to find a particular bus Gaetan Rivet
2017-06-21 12:12         ` Thomas Monjalon
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 2/9] bus: add device iterator Gaetan Rivet
2017-06-21 11:55         ` Thomas Monjalon
2017-06-21 12:15           ` Gaëtan Rivet
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 3/9] bus: add helper to find bus for a particular device Gaetan Rivet
2017-06-21 12:11         ` Thomas Monjalon
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 4/9] bus: add bus helper iterator to find " Gaetan Rivet
2017-06-21 12:21         ` Thomas Monjalon
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 5/9] bus: introduce hotplug functionality Gaetan Rivet
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 6/9] vdev: implement find_device bus operation Gaetan Rivet
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 7/9] vdev: implement hotplug functionality Gaetan Rivet
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 8/9] eal: make virtual driver probe and remove take rte_vdev_device Gaetan Rivet
2017-06-20 23:29       ` [dpdk-dev] [PATCH v4 9/9] ethdev: use embedded rte_device to detach driver Gaetan Rivet
2017-06-21 14:33         ` Thomas Monjalon
2017-06-21 14:35         ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3e6830ce1bd72a5b8d6abac2f8512cf0c8fa8005.1496235017.git.gaetan.rivet@6wind.com \
    --to=gaetan.rivet@6wind.com \
    --cc=dev@dpdk.org \
    --cc=jblunck@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).