eal: remove deprecated coherent IO memory barriers

[dpdk.git] / drivers / net / octeontx2 / otx2_rx.c

diff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c
index db4a221..2da8efe 100644 (file)
--- a/drivers/net/octeontx2/otx2_rx.c
+++ b/drivers/net/octeontx2/otx2_rx.c
@@ -130,16 +130,22 @@ nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
        const uintptr_t desc = rxq->desc;
        uint8x16_t f0, f1, f2, f3;
        uint32_t head = rxq->head;
+       uint16_t pkts_left;
 
        pkts = nix_rx_nb_pkts(rxq, wdata, pkts, qmask);
+       pkts_left = pkts & (NIX_DESCS_PER_LOOP - 1);
+
        /* Packets has to be floor-aligned to NIX_DESCS_PER_LOOP */
        pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);
 
        while (packets < pkts) {
-               /* Get the CQ pointers, since the ring size is multiple of
-                * 4, We can avoid checking the wrap around of head
-                * value after the each access unlike scalar version.
-                */
+               /* Exit loop if head is about to wrap and become unaligned */
+               if (((head + NIX_DESCS_PER_LOOP - 1) & qmask) <
+                               NIX_DESCS_PER_LOOP) {
+                       pkts_left += (pkts - packets);
+                       break;
+               }
+
                const uintptr_t cq0 = desc + CQE_SZ(head);
 
                /* Prefetch N desc ahead */
@@ -297,10 +303,14 @@ nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
        rxq->head = head;
        rxq->available -= packets;
 
-       rte_cio_wmb();
+       rte_io_wmb();
        /* Free all the CQs that we've processed */
        otx2_write64((rxq->wdata | packets), rxq->cq_door);
 
+       if (unlikely(pkts_left))
+               packets += nix_recv_pkts(rx_queue, &rx_pkts[packets],
+                                        pkts_left, flags);
+
        return packets;
 }
 
@@ -320,15 +330,15 @@ nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
 
 #endif
 
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-static uint16_t __rte_noinline __hot                                          \
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                            \
+static uint16_t __rte_noinline __rte_hot                                              \
 otx2_nix_recv_pkts_ ## name(void *rx_queue,                                   \
                        struct rte_mbuf **rx_pkts, uint16_t pkts)              \
 {                                                                             \
        return nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags));                \
 }                                                                             \
                                                                               \
-static uint16_t __rte_noinline __hot                                          \
+static uint16_t __rte_noinline __rte_hot                                              \
 otx2_nix_recv_pkts_mseg_ ## name(void *rx_queue,                              \
                        struct rte_mbuf **rx_pkts, uint16_t pkts)              \
 {                                                                             \
@@ -336,7 +346,7 @@ otx2_nix_recv_pkts_mseg_ ## name(void *rx_queue,                           \
                             (flags) | NIX_RX_MULTI_SEG_F);                    \
 }                                                                             \
                                                                               \
-static uint16_t __rte_noinline __hot                                          \
+static uint16_t __rte_noinline __rte_hot                                              \
 otx2_nix_recv_pkts_vec_ ## name(void *rx_queue,                                       \
                        struct rte_mbuf **rx_pkts, uint16_t pkts)              \
 {                                                                             \
@@ -351,12 +361,13 @@ 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][2])
+            const eth_rx_burst_t rx_burst[2][2][2][2][2][2][2])
 {
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
 
-       /* [TSTMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
+       /* [SEC] [TSTMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
        eth_dev->rx_pkt_burst = rx_burst
+               [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_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_VLAN_STRIP_F)]
@@ -370,25 +381,25 @@ otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev)
 {
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
 
-       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] =  otx2_nix_recv_pkts_ ## name,
+       const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_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][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_mseg_ ## name,
+       const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_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][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_vec_ ## name,
+       const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_vec_ ## name,
 
 NIX_RX_FASTPATH_MODES
 #undef R
@@ -408,6 +419,6 @@ NIX_RX_FASTPATH_MODES
        /* 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][0];
+                       nix_eth_rx_burst_mseg[0][0][0][0][0][0][0];
        rte_mb();
 }