DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bernard Iremonger <bernard.iremonger@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 05/20] ring: remove pci device driver
Date: Mon,  5 Oct 2015 11:30:20 +0100	[thread overview]
Message-ID: <1444041035-4936-6-git-send-email-bernard.iremonger@intel.com> (raw)
In-Reply-To: <1444041035-4936-1-git-send-email-bernard.iremonger@intel.com>

remove rte_ring_pmd and pci_dev.
initialise dev_flags, driver, drv_name, kdrv and numa_node fields in eth_dev data.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 drivers/net/ring/rte_eth_ring.c | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 0ba36d5..65608b2 100644
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -44,8 +44,6 @@
 #define ETH_RING_ACTION_CREATE		"CREATE"
 #define ETH_RING_ACTION_ATTACH		"ATTACH"
 
-static const char *ring_ethdev_driver_name = "Ring PMD";
-
 static const char *valid_arguments[] = {
 	ETH_RING_NUMA_NODE_ACTION_ARG,
 	NULL
@@ -252,15 +250,6 @@ static const struct eth_dev_ops ops = {
 	.mac_addr_add = eth_mac_addr_add,
 };
 
-static struct eth_driver rte_ring_pmd = {
-	.pci_drv = {
-		.name = "rte_ring_pmd",
-		.drv_flags = RTE_PCI_DRV_DETACHABLE,
-	},
-};
-
-static struct rte_pci_id id_table;
-
 int
 rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		const unsigned nb_rx_queues,
@@ -269,7 +258,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		const unsigned numa_node)
 {
 	struct rte_eth_dev_data *data = NULL;
-	struct rte_pci_device *pci_dev = NULL;
 	struct pmd_internals *internals = NULL;
 	struct rte_eth_dev *eth_dev = NULL;
 
@@ -291,10 +279,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 	if (data == NULL)
 		goto error;
 
-	pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, numa_node);
-	if (pci_dev == NULL)
-		goto error;
-
 	internals = rte_zmalloc_socket(name, sizeof(*internals), 0, numa_node);
 	if (internals == NULL)
 		goto error;
@@ -304,11 +288,10 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 	if (eth_dev == NULL)
 		goto error;
 
-
 	/* now put it all together
 	 * - store queue data in internals,
-	 * - store numa_node info in pci_driver
-	 * - point eth_dev_data to internals and pci_driver
+	 * - store numa_node info in eth_dev_data
+	 * - point eth_dev_data to internals
 	 * - and point eth_dev structure to new eth_dev_data structure
 	 */
 	/* NOTE: we'll replace the data element, of originally allocated eth_dev
@@ -323,12 +306,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 		internals->tx_ring_queues[i].rng = tx_queues[i];
 	}
 
-	rte_ring_pmd.pci_drv.name = ring_ethdev_driver_name;
-	rte_ring_pmd.pci_drv.id_table = &id_table;
-
-	pci_dev->numa_node = numa_node;
-	pci_dev->driver = &rte_ring_pmd.pci_drv;
-
 	data->dev_private = internals;
 	data->port_id = eth_dev->data->port_id;
 	memmove(data->name, eth_dev->data->name, sizeof(data->name));
@@ -338,9 +315,13 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 	data->mac_addrs = &internals->address;
 
 	eth_dev->data = data;
-	eth_dev->driver = &rte_ring_pmd;
+	eth_dev->driver = NULL;
 	eth_dev->dev_ops = &ops;
-	eth_dev->pci_dev = pci_dev;
+	eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE;
+	eth_dev->data->kdrv = RTE_KDRV_NONE;
+	eth_dev->data->drv_name = NULL;
+	eth_dev->data->numa_node = numa_node;
+
 	TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
 	/* finally assign rx and tx ops */
@@ -351,7 +332,6 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
 
 error:
 	rte_free(data);
-	rte_free(pci_dev);
 	rte_free(internals);
 
 	return -1;
@@ -561,7 +541,6 @@ rte_pmd_ring_devuninit(const char *name)
 	eth_dev_stop(eth_dev);
 	rte_free(eth_dev->data->dev_private);
 	rte_free(eth_dev->data);
-	rte_free(eth_dev->pci_dev);
 
 	rte_eth_dev_release_port(eth_dev);
 	return 0;
-- 
1.9.1

  parent reply	other threads:[~2015-10-05 10:30 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <PATCH v2>
2015-10-05 10:30 ` [dpdk-dev] [PATCH v2 00/20] remove pci driver from vdevs Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 01/20] librte_eal: add RTE_KDRV_NONE for vdevs Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 02/20] librte_ether: add fields from rte_pci_driver to rte_eth_dev_data Bernard Iremonger
2015-10-12 10:46     ` Mcnamara, John
2015-10-12 16:17       ` Iremonger, Bernard
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 03/20] librte_ether: add function rte_eth_copy_dev_info() Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 04/20] null: remove pci device driver Bernard Iremonger
2015-10-05 10:30   ` Bernard Iremonger [this message]
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 06/20] bonding: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 07/20] pcap: " Bernard Iremonger
2015-10-12 10:48     ` Mcnamara, John
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 08/20] af_packet: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 09/20] xenvirt: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 10/20] mpipe: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 11/20] ixgbe: copy pci device info to eth_dev data Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 12/20] e1000: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 13/20] i40e: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 14/20] fm10k: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 15/20] bnx2x: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 16/20] cxgbe: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 17/20] enic: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 18/20] mlx4: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 19/20] virtio: " Bernard Iremonger
2015-10-05 10:30   ` [dpdk-dev] [PATCH v2 20/20] vmxnet3: " Bernard Iremonger
2015-10-22 13:21 ` [dpdk-dev] [PATCH v2 1/1] vhost_xen: fix compile error in main.c Bernard Iremonger
2015-10-23 10:33   ` Ananyev, Konstantin
2015-10-30 17:01   ` Thomas Monjalon
2015-10-30 17:07     ` Iremonger, Bernard
2015-10-30 17:28       ` Thomas Monjalon
2015-10-22 14:28 ` [dpdk-dev] [PATCH v2 0/1] vmxnet3 hotplug support Bernard Iremonger
2015-10-22 14:28   ` [dpdk-dev] [PATCH v2 1/1] vmxnet3: add PCI Port Hotplug support Bernard Iremonger
2015-10-31  8:37     ` Yong Wang
2015-10-27 16:03 ` [dpdk-dev] [PATCH v2 0/2] xenvirt hotplug support Bernard Iremonger
2015-10-27 16:03   ` [dpdk-dev] [PATCH v2 1/2] xenvirt: add support for Port Hotplug Bernard Iremonger
2015-10-27 16:03   ` [dpdk-dev] [PATCH v2 2/2] xenvirt: free queues in dev_close Bernard Iremonger
2015-10-30  5:42   ` [dpdk-dev] [PATCH v2 0/2] xenvirt hotplug support Xie, Huawei
2015-10-30 16:57     ` 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=1444041035-4936-6-git-send-email-bernard.iremonger@intel.com \
    --to=bernard.iremonger@intel.com \
    --cc=dev@dpdk.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).