From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id E75DF939C for ; Fri, 30 Oct 2015 16:09:21 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 30 Oct 2015 08:09:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,219,1444719600"; d="scan'208";a="591062693" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by FMSMGA003.fm.intel.com with ESMTP; 30 Oct 2015 08:09:20 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t9UF9JK9009335; Fri, 30 Oct 2015 15:09:19 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t9UF9J7o010311; Fri, 30 Oct 2015 15:09:19 GMT Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id t9UF9JrW010307; Fri, 30 Oct 2015 15:09:19 GMT From: Bernard Iremonger To: dev@dpdk.org Date: Fri, 30 Oct 2015 15:08:46 +0000 Message-Id: <1446217733-9887-22-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1446217733-9887-1-git-send-email-bernard.iremonger@intel.com> References: <1446217733-9887-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v7 21/28] librte_ether: remove branches on pci_dev X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Oct 2015 15:09:22 -0000 use dev_type to distinguish between vdev's and pdev's. remove pci_dev branches. update release notes. Signed-off-by: Bernard Iremonger Acked-by: Bruce Richardson --- 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