[dpdk-dev] [PATCH v3 7/9] ethdev: Move filling of rte_eth_dev_info->pci_dev to dev_infos_get()

[Shreyansh Jain]

On Tuesday 20 December 2016 04:41 PM, Jan Blunck wrote:
> Only the device itself can decide its PCI or not.
>
> Signed-off-by: Jan Blunck <jblunck at infradead.org>
> ---
>  drivers/net/bnx2x/bnx2x_ethdev.c        | 1 +
>  drivers/net/bnxt/bnxt_ethdev.c          | 2 ++
>  drivers/net/cxgbe/cxgbe_ethdev.c        | 2 ++
>  drivers/net/e1000/em_ethdev.c           | 1 +
>  drivers/net/e1000/igb_ethdev.c          | 2 ++
>  drivers/net/ena/ena_ethdev.c            | 2 ++
>  drivers/net/enic/enic_ethdev.c          | 1 +
>  drivers/net/fm10k/fm10k_ethdev.c        | 1 +
>  drivers/net/i40e/i40e_ethdev.c          | 1 +
>  drivers/net/i40e/i40e_ethdev_vf.c       | 1 +
>  drivers/net/ixgbe/ixgbe_ethdev.c        | 2 ++
>  drivers/net/mlx4/mlx4.c                 | 2 ++
>  drivers/net/mlx5/mlx5_ethdev.c          | 2 ++
>  drivers/net/nfp/nfp_net.c               | 1 +
>  drivers/net/qede/qede_ethdev.c          | 1 +
>  drivers/net/szedata2/rte_eth_szedata2.c | 1 +
>  drivers/net/thunderx/nicvf_ethdev.c     | 2 ++
>  drivers/net/virtio/virtio_ethdev.c      | 1 +
>  drivers/net/vmxnet3/vmxnet3_ethdev.c    | 2 ++
>  lib/librte_ether/rte_ethdev.c           | 1 -
>  20 files changed, 28 insertions(+), 1 deletion(-)
>

<snip>

> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
> index f17da46..c88b7bf 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -3043,6 +3043,7 @@ ixgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
>  	struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
>  	struct rte_pci_device *pci_dev = ETH_DEV_PCI_DEV(dev);
>
> +	dev_info->pci_dev = ETH_DEV_PCI_DEV(dev);
>  	dev_info->max_rx_queues = (uint16_t)hw->mac.max_rx_queues;
>  	dev_info->max_tx_queues = (uint16_t)hw->mac.max_tx_queues;
>  	if (RTE_ETH_DEV_SRIOV(dev).active == 0) {
> @@ -3175,6 +3176,7 @@ ixgbevf_dev_info_get(struct rte_eth_dev *dev,
>  	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
>  	struct rte_pci_device *pci_dev = ETH_DEV_PCI_DEV(dev);
>
> +	dev_info->pci_dev = ETH_DEV_PCI_DEV(dev);
>  	dev_info->max_rx_queues = (uint16_t)hw->mac.max_rx_queues;
>  	dev_info->max_tx_queues = (uint16_t)hw->mac.max_tx_queues;
>  	dev_info->min_rx_bufsize = 1024; /* cf BSIZEPACKET in SRRCTL reg */
> diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
> index da61a85..5455fea 100644
> --- a/drivers/net/mlx4/mlx4.c
> +++ b/drivers/net/mlx4/mlx4.c
> @@ -4421,6 +4421,8 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
>  	unsigned int max;
>  	char ifname[IF_NAMESIZE];
>
> +	info->pci_dev = ETH_DEV_PCI_DEV(dev);
> +

My compilation environment is reporting following error:

--->8---
/home/shreyansh/build/DPDK/01_dpdk/drivers/net/mlx4/mlx4.c: In function 
‘mlx4_pci_probe’:
/home/shreyansh/build/DPDK/01_dpdk/drivers/net/mlx4/mlx4.c:5843:10: 
error: ‘struct rte_eth_dev’ has no member named ‘pci_dev’
    eth_dev->pci_dev = pci_dev;
           ^
/home/shreyansh/build/DPDK/01_dpdk/mk/internal/rte.compile-pre.mk:138: 
recipe for target 'mlx4.o' failed
--->8---

Exact same issue exists on MLX5 also I think:

1d [shreyansh:~/build/DPDK/01_dpdk] 
tmp/jan_patches_ethdev_21dec(+11/-11)+* ± grep "eth_dev->pci_dev" * -rn
drivers/net/mlx5/mlx5.c:660:            eth_dev->pci_dev = pci_dev;
drivers/net/mlx4/mlx4.c:5843:           eth_dev->pci_dev = pci_dev;

(I don't yet have MLX5 compilation env - so, above is just my guess).


>  	if (priv == NULL)
>  		return;
>  	priv_lock(priv);
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index c0f73e9..489a4f6 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -562,6 +562,8 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
>  	unsigned int max;
>  	char ifname[IF_NAMESIZE];
>
> +	info->pci_dev = ETH_DEV_PCI_DEV(dev);
> +
>  	priv_lock(priv);
>  	/* FIXME: we should ask the device for these values. */
>  	info->min_rx_bufsize = 32;

<Snip>

-
Shreyansh