From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 900318E83 for ; Mon, 12 Oct 2015 18:25:43 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP; 12 Oct 2015 09:25:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,673,1437462000"; d="scan'208";a="824866097" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 12 Oct 2015 09:25:40 -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 t9CGPd5D005574; Mon, 12 Oct 2015 17:25:40 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t9CGPdJm013180; Mon, 12 Oct 2015 17:25:39 +0100 Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id t9CGPdaq013175; Mon, 12 Oct 2015 17:25:39 +0100 From: Bernard Iremonger To: dev@dpdk.org Date: Mon, 12 Oct 2015 17:25:02 +0100 Message-Id: <1444667120-12891-3-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1444667120-12891-1-git-send-email-bernard.iremonger@intel.com> References: <1444667120-12891-1-git-send-email-bernard.iremonger@intel.com> Subject: [dpdk-dev] [PATCH v3 02/20] librte_ether: add fields from rte_pci_driver to rte_eth_dev_data 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: Mon, 12 Oct 2015 16:25:44 -0000 add dev_flags to rte_eth_dev_data, add macros for dev_flags. add kdrv to rte_eth_dev_data. add numa_node to rte_eth_dev_data. add drv_name to rte_eth_dev_data. use dev_type to distinguish between vdev's and pdev's. remove pci_dev branches. Signed-off-by: Bernard Iremonger --- lib/librte_ether/rte_ethdev.c | 40 +++++++++++++++++----------------------- lib/librte_ether/rte_ethdev.h | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index f593f6e..4187595 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 diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 8a8c82b..d440bd6 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1471,8 +1471,23 @@ struct rte_eth_dev_data { all_multicast : 1, /**< RX all multicast mode ON(1) / OFF(0). */ dev_started : 1, /**< Device state: STARTED(1) / STOPPED(0). */ lro : 1; /**< RX LRO is ON(1) / OFF(0) */ + uint32_t dev_flags; /**< Flags controlling handling of device. */ + enum rte_kernel_driver kdrv; /**< Kernel driver passthrough */ + int numa_node; + const char *drv_name; }; +/** Device needs PCI BAR mapping (done with either IGB_UIO or VFIO) */ +#define RTE_ETH_DEV_DRV_NEED_MAPPING RTE_PCI_DRV_NEED_MAPPING +/** Device needs to be unbound even if no module is provided */ +#define RTE_ETH_DEV_DRV_FORCE_UNBIND RTE_PCI_DRV_FORCE_UNBIND +/** Device supports link state interrupt */ +#define RTE_ETH_DEV_INTR_LSC RTE_PCI_DRV_INTR_LSC +/** Device supports detaching capability */ +#define RTE_ETH_DEV_DETACHABLE RTE_PCI_DRV_DETACHABLE +/** Device is a bonded device */ +#define RTE_ETH_DEV_BONDED 0x0020 + /** * @internal * The pool of *rte_eth_dev* structures. The size of the pool -- 1.9.1