DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bernard Iremonger <bernard.iremonger@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v7 21/28] librte_ether: remove branches on pci_dev
Date: Fri, 30 Oct 2015 15:08:46 +0000	[thread overview]
Message-ID: <1446217733-9887-22-git-send-email-bernard.iremonger@intel.com> (raw)
In-Reply-To: <1446217733-9887-1-git-send-email-bernard.iremonger@intel.com>

use dev_type to distinguish between vdev's and pdev's.
remove pci_dev branches.
update release notes.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 doc/guides/rel_notes/release_2_2.rst |  4 ++++
 lib/librte_ether/rte_ethdev.c        | 40 +++++++++++++++---------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst
index 89e4d58..d367580 100644
--- a/doc/guides/rel_notes/release_2_2.rst
+++ b/doc/guides/rel_notes/release_2_2.rst
@@ -31,6 +31,10 @@ New Features
 
 * **Added vhost-user multiple queue support.**
 
+* **Removed the PCI device from vdev PMD's.**
+
+  * This change required modifications to librte_ether and all vdev and pdev PMD's.
+
 Resolved Issues
 ---------------
 
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index ce1d000..2fce370 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -424,7 +424,7 @@ rte_eth_dev_socket_id(uint8_t port_id)
 {
 	if (!rte_eth_dev_is_valid_port(port_id))
 		return -1;
-	return rte_eth_devices[port_id].pci_dev->numa_node;
+	return rte_eth_devices[port_id].data->numa_node;
 }
 
 uint8_t
@@ -503,27 +503,25 @@ rte_eth_dev_get_name_by_port(uint8_t port_id, char *name)
 static int
 rte_eth_dev_is_detachable(uint8_t port_id)
 {
-	uint32_t drv_flags;
+	uint32_t dev_flags;
 
 	if (!rte_eth_dev_is_valid_port(port_id)) {
 		PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
 		return -EINVAL;
 	}
 
-	if (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) {
-		switch (rte_eth_devices[port_id].pci_dev->kdrv) {
-		case RTE_KDRV_IGB_UIO:
-		case RTE_KDRV_UIO_GENERIC:
-		case RTE_KDRV_NIC_UIO:
-			break;
-		case RTE_KDRV_VFIO:
-		default:
-			return -ENOTSUP;
-		}
+	switch (rte_eth_devices[port_id].data->kdrv) {
+	case RTE_KDRV_IGB_UIO:
+	case RTE_KDRV_UIO_GENERIC:
+	case RTE_KDRV_NIC_UIO:
+	case RTE_KDRV_NONE:
+		break;
+	case RTE_KDRV_VFIO:
+	default:
+		return -ENOTSUP;
 	}
-
-	drv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags;
-	return !(drv_flags & RTE_PCI_DRV_DETACHABLE);
+	dev_flags = rte_eth_devices[port_id].data->dev_flags;
+	return !(dev_flags & RTE_ETH_DEV_DETACHABLE);
 }
 
 /* attach the new physical device, then store port_id of the device */
@@ -1143,14 +1141,11 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
 	 * If link state interrupt is enabled, check that the
 	 * device supports it.
 	 */
-	if (dev_conf->intr_conf.lsc == 1) {
-		const struct rte_pci_driver *pci_drv = &dev->driver->pci_drv;
-
-		if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
+	if ((dev_conf->intr_conf.lsc == 1) &&
+		(!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) {
 			PMD_DEBUG_TRACE("driver %s does not support lsc\n",
-					pci_drv->name);
+					dev->data->drv_name);
 			return -EINVAL;
-		}
 	}
 
 	/*
@@ -1795,8 +1790,7 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info)
 	FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get);
 	(*dev->dev_ops->dev_infos_get)(dev, dev_info);
 	dev_info->pci_dev = dev->pci_dev;
-	if (dev->driver)
-		dev_info->driver_name = dev->driver->pci_drv.name;
+	dev_info->driver_name = dev->data->drv_name;
 }
 
 void
-- 
1.9.1

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

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <PATCH v7>
2015-10-30 15:08 ` [dpdk-dev] [PATCH v7 00/28] remove pci driver from vdevs Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 01/28] librte_eal: add RTE_KDRV_NONE for vdevs Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 02/28] librte_ether: add fields from rte_pci_driver to rte_eth_dev_data Bernard Iremonger
2015-11-01 21:12     ` Thomas Monjalon
2015-11-02 10:36       ` Iremonger, Bernard
2015-11-02 16:32         ` Thomas Monjalon
2015-11-02 16:44           ` Iremonger, Bernard
2015-11-02 17:42             ` Thomas Monjalon
2015-11-01 21:41     ` Thomas Monjalon
2015-11-02 10:33       ` Iremonger, Bernard
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 03/28] librte_ether: add function rte_eth_copy_dev_info Bernard Iremonger
2015-11-01 21:30     ` Thomas Monjalon
2015-11-02 10:24       ` Iremonger, Bernard
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 04/28] ixgbe: copy pci device info to eth_dev data Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 05/28] e1000: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 06/28] i40e: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 07/28] fm10k: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 08/28] bnx2x: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 09/28] cxgbe: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 10/28] enic: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 11/28] mlx4: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 12/28] virtio: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 13/28] vmxnet3: " Bernard Iremonger
2015-10-31  8:39     ` Yong Wang
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 14/28] null: copy " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 15/28] ring: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 16/28] pcap: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 17/28] af_packet: " Bernard Iremonger
2015-10-30 15:17     ` John W. Linville
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 18/28] xenvirt: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 19/28] mpipe: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 20/28] bonding: " Bernard Iremonger
2015-10-30 15:08   ` Bernard Iremonger [this message]
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 22/28] null: remove pci device Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 23/28] ring: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 24/28] pcap: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 25/28] af_packet: " Bernard Iremonger
2015-10-30 15:19     ` John W. Linville
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 26/28] xenvirt: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 27/28] mpipe: " Bernard Iremonger
2015-10-30 15:08   ` [dpdk-dev] [PATCH v7 28/28] bonding: " Bernard Iremonger
2015-11-01 21:35     ` Thomas Monjalon
2015-11-02 10:27       ` Iremonger, Bernard
2015-10-30 15:21   ` [dpdk-dev] [PATCH v7 00/28] remove pci driver from vdevs Thomas Monjalon
2015-10-30 15:28     ` Iremonger, Bernard
2015-11-02  5:28   ` Qiu, Michael
2015-11-02  7:35     ` Thomas Monjalon
2015-11-02 10:13       ` Iremonger, Bernard

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=1446217733-9887-22-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).