ethdev: add namespace

[dpdk.git] / drivers / net / cnxk / cn10k_tx.c

diff --git a/drivers/net/cnxk/cn10k_tx.c b/drivers/net/cnxk/cn10k_tx.c
index e6eb101..5e6c5ee 100644 (file)
--- a/drivers/net/cnxk/cn10k_tx.c
+++ b/drivers/net/cnxk/cn10k_tx.c
@@ -5,7 +5,7 @@
 #include "cn10k_ethdev.h"
 #include "cn10k_tx.h"
 
-#define T(name, f4, f3, f2, f1, f0, sz, flags)                                \
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                        \
        uint16_t __rte_noinline __rte_hot cn10k_nix_xmit_pkts_##name(          \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
        {                                                                      \
@@ -16,7 +16,7 @@
                    !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
                        return 0;                                              \
                return cn10k_nix_xmit_pkts(tx_queue, tx_pkts, pkts, cmd,       \
-                                          flags);                             \
+                                          0, flags);                          \
        }
 
 NIX_TX_FASTPATH_MODES
@@ -24,12 +24,14 @@ NIX_TX_FASTPATH_MODES
 
 static inline void
 pick_tx_func(struct rte_eth_dev *eth_dev,
-            const eth_tx_burst_t tx_burst[2][2][2][2][2])
+            const eth_tx_burst_t tx_burst[2][2][2][2][2][2][2])
 {
        struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
 
-       /* [TSO] [NOFF] [VLAN] [OL3_OL4_CSUM] [IL3_IL4_CSUM] */
+       /* [SEC] [TSP] [TSO] [NOFF] [VLAN] [OL3_OL4_CSUM] [IL3_IL4_CSUM] */
        eth_dev->tx_pkt_burst = tx_burst
+               [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_SECURITY_F)]
+               [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSTAMP_F)]
                [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSO_F)]
                [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)]
                [!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_VLAN_QINQ_F)]
@@ -42,39 +44,47 @@ cn10k_eth_set_tx_function(struct rte_eth_dev *eth_dev)
 {
        struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
 
-       const eth_tx_burst_t nix_eth_tx_burst[2][2][2][2][2] = {
-#define T(name, f4, f3, f2, f1, f0, sz, flags)                         \
-       [f4][f3][f2][f1][f0] = cn10k_nix_xmit_pkts_##name,
+       const eth_tx_burst_t nix_eth_tx_burst[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_xmit_pkts_##name,
 
                NIX_TX_FASTPATH_MODES
 #undef T
        };
 
-       const eth_tx_burst_t nix_eth_tx_burst_mseg[2][2][2][2][2] = {
-#define T(name, f4, f3, f2, f1, f0, sz, flags)                         \
-       [f4][f3][f2][f1][f0] = cn10k_nix_xmit_pkts_mseg_##name,
+       const eth_tx_burst_t nix_eth_tx_burst_mseg[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                        \
+       [f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_xmit_pkts_mseg_##name,
 
                NIX_TX_FASTPATH_MODES
 #undef T
        };
 
-       const eth_tx_burst_t nix_eth_tx_vec_burst[2][2][2][2][2] = {
-#define T(name, f4, f3, f2, f1, f0, sz, flags)                         \
-       [f4][f3][f2][f1][f0] = cn10k_nix_xmit_pkts_vec_##name,
+       const eth_tx_burst_t nix_eth_tx_vec_burst[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_xmit_pkts_vec_##name,
 
                NIX_TX_FASTPATH_MODES
 #undef T
        };
 
-       if (dev->scalar_ena ||
-           (dev->tx_offload_flags &
-            (NIX_TX_OFFLOAD_VLAN_QINQ_F | NIX_TX_OFFLOAD_TSO_F)))
+       const eth_tx_burst_t nix_eth_tx_vec_burst_mseg[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] = cn10k_nix_xmit_pkts_vec_mseg_##name,
+
+               NIX_TX_FASTPATH_MODES
+#undef T
+       };
+
+       if (dev->scalar_ena) {
                pick_tx_func(eth_dev, nix_eth_tx_burst);
-       else
+               if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
+                       pick_tx_func(eth_dev, nix_eth_tx_burst_mseg);
+       } else {
                pick_tx_func(eth_dev, nix_eth_tx_vec_burst);
-
-       if (dev->tx_offloads & DEV_TX_OFFLOAD_MULTI_SEGS)
-               pick_tx_func(eth_dev, nix_eth_tx_burst_mseg);
+               if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
+                       pick_tx_func(eth_dev, nix_eth_tx_vec_burst_mseg);
+       }
 
        rte_mb();
 }