net/mlx5: fix meter profile validation

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

diff --git a/drivers/net/cnxk/cn10k_rx.c b/drivers/net/cnxk/cn10k_rx.c
index c9744e2..69e767a 100644 (file)
--- a/drivers/net/cnxk/cn10k_rx.c
+++ b/drivers/net/cnxk/cn10k_rx.c
@@ -5,7 +5,7 @@
 #include "cn10k_ethdev.h"
 #include "cn10k_rx.h"
 
-#define R(name, f4, f3, f2, f1, f0, flags)                                    \
+#define R(name, f5, f4, f3, f2, f1, f0, flags)                                \
        uint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_##name(          \
                void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts)      \
        {                                                                      \
@@ -17,17 +17,20 @@ NIX_RX_FASTPATH_MODES
 
 static inline void
 pick_rx_func(struct rte_eth_dev *eth_dev,
-            const eth_rx_burst_t rx_burst[2][2][2][2][2])
+            const eth_rx_burst_t rx_burst[2][2][2][2][2][2])
 {
        struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
 
-       /* [TSP] [MARK] [CKSUM] [PTYPE] [RSS] */
+       /* [VLAN] [TSP] [MARK] [CKSUM] [PTYPE] [RSS] */
        eth_dev->rx_pkt_burst = rx_burst
+               [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)];
+
+       rte_atomic_thread_fence(__ATOMIC_RELEASE);
 }
 
 void
@@ -35,44 +38,50 @@ cn10k_eth_set_rx_function(struct rte_eth_dev *eth_dev)
 {
        struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
 
-       const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2] = {
-#define R(name, f4, f3, f2, f1, f0, flags)                                    \
-       [f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_##name,
+       const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2] = {
+#define R(name, f5, f4, f3, f2, f1, f0, flags)                                \
+       [f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_##name,
 
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2] = {
-#define R(name, f4, f3, f2, f1, f0, flags)                                    \
-       [f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_mseg_##name,
+       const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2] = {
+#define R(name, f5, f4, f3, f2, f1, f0, flags)                                \
+       [f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_mseg_##name,
 
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2] = {
-#define R(name, f4, f3, f2, f1, f0, flags)                                    \
-       [f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_##name,
+       const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2] = {
+#define R(name, f5, f4, f3, f2, f1, f0, flags)                                \
+       [f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_##name,
 
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       /* For PTP enabled, scalar rx function should be chosen as most of the
-        * PTP apps are implemented to rx burst 1 pkt.
-        */
-       if (dev->scalar_ena || dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP)
-               pick_rx_func(eth_dev, nix_eth_rx_burst);
-       else
-               pick_rx_func(eth_dev, nix_eth_rx_vec_burst);
+       const eth_rx_burst_t nix_eth_rx_vec_burst_mseg[2][2][2][2][2][2] = {
+#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
+       [f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_mseg_##name,
 
-       if (dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER)
-               pick_rx_func(eth_dev, nix_eth_rx_burst_mseg);
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
 
        /* Copy multi seg version with no offload for tear down sequence */
        if (rte_eal_process_type() == RTE_PROC_PRIMARY)
                dev->rx_pkt_burst_no_offload =
-                       nix_eth_rx_burst_mseg[0][0][0][0][0];
-       rte_mb();
+                       nix_eth_rx_burst_mseg[0][0][0][0][0][0];
+
+       if (dev->scalar_ena) {
+               if (dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER)
+                       return pick_rx_func(eth_dev, nix_eth_rx_burst_mseg);
+               return pick_rx_func(eth_dev, nix_eth_rx_burst);
+       }
+
+       if (dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER)
+               return pick_rx_func(eth_dev, nix_eth_rx_vec_burst_mseg);
+       return pick_rx_func(eth_dev, nix_eth_rx_vec_burst);
 }