On Wednesday 21 December 2016 03:20 PM, Shreyansh Jain wrote:

On Tuesday 20 December 2016 04:41 PM, Jan Blunck wrote:

quoted

The drivers should not directly access the rte_eth_dev->pci_dev but use
a macro instead. This is a preparation for replacing the pci_dev with
a struct rte_device member in the future.

Signed-off-by: Jan Blunck <redacted>
---
 drivers/net/bnx2x/bnx2x_ethdev.c        | 12 +++---
 drivers/net/bnxt/bnxt_ethdev.c          | 19 ++++++----
 drivers/net/bnxt/bnxt_ring.c            | 11 +++---
 drivers/net/cxgbe/cxgbe_ethdev.c        |  2 +-
 drivers/net/e1000/em_ethdev.c           | 20 ++++++----
 drivers/net/e1000/igb_ethdev.c          | 50 ++++++++++++++-----------
 drivers/net/e1000/igb_pf.c              |  3 +-
 drivers/net/ena/ena_ethdev.c            |  2 +-
 drivers/net/enic/enic_ethdev.c          |  2 +-
 drivers/net/fm10k/fm10k_ethdev.c        | 49 +++++++++++++------------
 drivers/net/i40e/i40e_ethdev.c          | 44 +++++++++++-----------
 drivers/net/i40e/i40e_ethdev.h          |  4 ++
 drivers/net/i40e/i40e_ethdev_vf.c       | 38 +++++++++----------
 drivers/net/ixgbe/ixgbe_ethdev.c        | 65
++++++++++++++++++++-------------
 drivers/net/ixgbe/ixgbe_pf.c            |  2 +-
 drivers/net/nfp/nfp_net.c               | 16 ++++----
 drivers/net/qede/qede_ethdev.c          | 17 +++++----
 drivers/net/szedata2/rte_eth_szedata2.c | 27 +++++++-------
 drivers/net/szedata2/rte_eth_szedata2.h | 34 ++++++++---------
 drivers/net/thunderx/nicvf_ethdev.c     |  5 ++-
 drivers/net/vmxnet3/vmxnet3_ethdev.c    |  4 +-
 21 files changed, 234 insertions(+), 192 deletions(-)

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c

b/drivers/net/bnx2x/bnx2x_ethdev.c
index 0eae433..c331ccd 100644

--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c

@@ -124,7 +124,7 @@ bnx2x_interrupt_handler(__rte_unused struct

rte_intr_handle *handle, void *param
     struct rte_eth_dev *dev = (struct rte_eth_dev *)param;

     bnx2x_interrupt_action(dev);
-    rte_intr_enable(&(dev->pci_dev->intr_handle));
+    rte_intr_enable(&(ETH_DEV_PCI_DEV(dev)->intr_handle));
 }

 /*

@@ -187,10 +187,10 @@ bnx2x_dev_start(struct rte_eth_dev *dev)
     }

     if (IS_PF(sc)) {
-        rte_intr_callback_register(&(dev->pci_dev->intr_handle),
+        rte_intr_callback_register(&sc->pci_dev->intr_handle,
                 bnx2x_interrupt_handler, (void *)dev);

-        if(rte_intr_enable(&(dev->pci_dev->intr_handle)))
+        if (rte_intr_enable(&sc->pci_dev->intr_handle))

This changeset generates following error in my environment:

--->8---
/home/shreyansh/build/DPDK/01_dpdk/drivers/net/bnx2x/bnx2x_ethdev.c: In
function ‘bnx2x_dev_start’:
/home/shreyansh/build/DPDK/01_dpdk/drivers/net/bnx2x/bnx2x_ethdev.c:190:30:
error: passing argument 1 of ‘rte_intr_callback_register’ discards
‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
   rte_intr_callback_register(&sc->pci_dev->intr_handle,
                              ^
In file included from
/home/shreyansh/build/DPDK/01_dpdk/x86_64-native-linuxapp-gcc/include/rte_pci.h:86:0,

                 from
/home/shreyansh/build/DPDK/01_dpdk/drivers/net/bnx2x/bnx2x_ethdev.h:34,
                 from
/home/shreyansh/build/DPDK/01_dpdk/drivers/net/bnx2x/bnx2x.h:34,
                 from
/home/shreyansh/build/DPDK/01_dpdk/drivers/net/bnx2x/bnx2x_ethdev.c:11:
/home/shreyansh/build/DPDK/01_dpdk/x86_64-native-linuxapp-gcc/include/rte_interrupts.h:73:5:
note: expected ‘struct rte_intr_handle *’ but argument is of type ‘const
struct rte_intr_handle *’
 int rte_intr_callback_register(struct rte_intr_handle *intr_handle,

--->8---

Problem is that earlier 'eth_dev->pci_dev->intr_handle' was being passed
which was not a 'const'. But, the BNX2 local structure 'bnx2x_softc' has
a 'const struct rte_pci_device *' as member.

Maybe, following can help:

rte_intr_callback_register(&ETH_DEV_PCI_DEV(dev),...);

Forgot to add to above as a side note:
In case you are trying to extract info from private info of bnx2x, my 
suggestion above is wrong (though, the compilation error still exists).

quoted

             PMD_DRV_LOG(ERR, "rte_intr_enable failed");
     }

@@ -215,8 +215,8 @@ bnx2x_dev_stop(struct rte_eth_dev *dev)
     PMD_INIT_FUNC_TRACE();

     if (IS_PF(sc)) {
-        rte_intr_disable(&(dev->pci_dev->intr_handle));
-        rte_intr_callback_unregister(&(dev->pci_dev->intr_handle),
+        rte_intr_disable(&sc->pci_dev->intr_handle);
+        rte_intr_callback_unregister(&sc->pci_dev->intr_handle,

Similar error here.
rte_intr_callback_unregister(&(ETH_DEV_PCI_DEV(dev)->intr_handle), ...)
solves it for me.

quoted

                 bnx2x_interrupt_handler, (void *)dev);
     }

@@ -516,7 +516,7 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev,

int is_vf)
     PMD_INIT_FUNC_TRACE();

     eth_dev->dev_ops = is_vf ? &bnx2xvf_eth_dev_ops :
&bnx2x_eth_dev_ops;
-    pci_dev = eth_dev->pci_dev;
+    pci_dev = ETH_DEV_PCI_DEV(eth_dev);

     rte_eth_copy_pci_info(eth_dev, pci_dev);

<snip>

-
Shreyansh