d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethdev: remove some PCI specific handling

Browse Source 
use dev_type to distinguish between vdev's and pdev's.
remove pci_dev branches.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bernard Iremonger 2015-11-03 13:01:58 +00:00 committed by Thomas Monjalon
parent 8fb9e2bbf9
commit b1fb53a39d
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/librte_ether/rte_ethdev.c
View File

@ -427,7 +427,7 @@ rte_eth_dev_socket_id(uint8_t port_id)
{ {
if (!rte_eth_dev_is_valid_port(port_id)) if (!rte_eth_dev_is_valid_port(port_id))
return -1; return -1;
return rte_eth_devices[port_id].pci_dev->numa_node; return rte_eth_devices[port_id].data->numa_node;
} }
uint8_t uint8_t
@ -533,27 +533,25 @@ rte_eth_dev_get_port_by_addr(const struct rte_pci_addr *addr, uint8_t *port_id)
static int static int
rte_eth_dev_is_detachable(uint8_t port_id) 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)) { if (!rte_eth_dev_is_valid_port(port_id)) {
PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id);
return -EINVAL; return -EINVAL;
} }
if (rte_eth_devices[port_id].dev_type == RTE_ETH_DEV_PCI) { switch (rte_eth_devices[port_id].data->kdrv) {
switch (rte_eth_devices[port_id].pci_dev->kdrv) { case RTE_KDRV_IGB_UIO:
case RTE_KDRV_IGB_UIO: case RTE_KDRV_UIO_GENERIC:
case RTE_KDRV_UIO_GENERIC: case RTE_KDRV_NIC_UIO:
case RTE_KDRV_NIC_UIO: case RTE_KDRV_NONE:
break; break;
case RTE_KDRV_VFIO: case RTE_KDRV_VFIO:
default: default:
return -ENOTSUP; return -ENOTSUP;
}
} }
dev_flags = rte_eth_devices[port_id].data->dev_flags;
drv_flags = rte_eth_devices[port_id].driver->pci_drv.drv_flags; return !(dev_flags & RTE_ETH_DEV_DETACHABLE);
return !(drv_flags & RTE_PCI_DRV_DETACHABLE);
} }
/* attach the new physical device, then store port_id of the device */ /* attach the new physical device, then store port_id of the device */
@ -965,14 +963,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 * If link state interrupt is enabled, check that the
* device supports it. * device supports it.
*/ */
if (dev_conf->intr_conf.lsc == 1) { if ((dev_conf->intr_conf.lsc == 1) &&
const struct rte_pci_driver *pci_drv = &dev->driver->pci_drv; (!(dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC))) {
if (!(pci_drv->drv_flags & RTE_PCI_DRV_INTR_LSC)) {
PMD_DEBUG_TRACE("driver %s does not support lsc\n", PMD_DEBUG_TRACE("driver %s does not support lsc\n",
pci_drv->name); dev->data->drv_name);
return -EINVAL; return -EINVAL;
}
} }
/* /*
@ -1634,8 +1629,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); FUNC_PTR_OR_RET(*dev->dev_ops->dev_infos_get);
(*dev->dev_ops->dev_infos_get)(dev, dev_info); (*dev->dev_ops->dev_infos_get)(dev, dev_info);
dev_info->pci_dev = dev->pci_dev; dev_info->pci_dev = dev->pci_dev;
if (dev->driver) dev_info->driver_name = dev->data->drv_name;
dev_info->driver_name = dev->driver->pci_drv.name;
} }
void void