net/octeontx: support event Rx adapter

[dpdk.git] / drivers / net / octeontx / octeontx_rxtx.c

diff --git a/drivers/net/octeontx/octeontx_rxtx.c b/drivers/net/octeontx/octeontx_rxtx.c
index 0b15833..2b58423 100644 (file)
--- a/drivers/net/octeontx/octeontx_rxtx.c
+++ b/drivers/net/octeontx/octeontx_rxtx.c
@@ -47,94 +47,6 @@
 #include "octeontx_rxtx.h"
 #include "octeontx_logs.h"
 
-/* Packet type table */
-#define PTYPE_SIZE     OCCTX_PKI_LTYPE_LAST
-
-static const uint32_t __rte_cache_aligned
-ptype_table[PTYPE_SIZE][PTYPE_SIZE][PTYPE_SIZE] = {
-       [LC_NONE][LE_NONE][LF_NONE] = RTE_PTYPE_UNKNOWN,
-       [LC_NONE][LE_NONE][LF_IPSEC_ESP] = RTE_PTYPE_UNKNOWN,
-       [LC_NONE][LE_NONE][LF_IPFRAG] = RTE_PTYPE_L4_FRAG,
-       [LC_NONE][LE_NONE][LF_IPCOMP] = RTE_PTYPE_UNKNOWN,
-       [LC_NONE][LE_NONE][LF_TCP] = RTE_PTYPE_L4_TCP,
-       [LC_NONE][LE_NONE][LF_UDP] = RTE_PTYPE_L4_UDP,
-       [LC_NONE][LE_NONE][LF_GRE] = RTE_PTYPE_TUNNEL_GRE,
-       [LC_NONE][LE_NONE][LF_UDP_GENEVE] = RTE_PTYPE_TUNNEL_GENEVE,
-       [LC_NONE][LE_NONE][LF_UDP_VXLAN] = RTE_PTYPE_TUNNEL_VXLAN,
-       [LC_NONE][LE_NONE][LF_NVGRE] = RTE_PTYPE_TUNNEL_NVGRE,
-
-       [LC_IPV4][LE_NONE][LF_NONE] = RTE_PTYPE_L3_IPV4 | RTE_PTYPE_UNKNOWN,
-       [LC_IPV4][LE_NONE][LF_IPSEC_ESP] =
-                               RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L3_IPV4,
-       [LC_IPV4][LE_NONE][LF_IPFRAG] = RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_FRAG,
-       [LC_IPV4][LE_NONE][LF_IPCOMP] = RTE_PTYPE_L3_IPV4 | RTE_PTYPE_UNKNOWN,
-       [LC_IPV4][LE_NONE][LF_TCP] = RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_TCP,
-       [LC_IPV4][LE_NONE][LF_UDP] = RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_UDP,
-       [LC_IPV4][LE_NONE][LF_GRE] = RTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_GRE,
-       [LC_IPV4][LE_NONE][LF_UDP_GENEVE] =
-                               RTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_GENEVE,
-       [LC_IPV4][LE_NONE][LF_UDP_VXLAN] =
-                               RTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_VXLAN,
-       [LC_IPV4][LE_NONE][LF_NVGRE] =
-                               RTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_NVGRE,
-
-       [LC_IPV4_OPT][LE_NONE][LF_NONE] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_UNKNOWN,
-       [LC_IPV4_OPT][LE_NONE][LF_IPSEC_ESP] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_L3_IPV4,
-       [LC_IPV4_OPT][LE_NONE][LF_IPFRAG] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_L4_FRAG,
-       [LC_IPV4_OPT][LE_NONE][LF_IPCOMP] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_UNKNOWN,
-       [LC_IPV4_OPT][LE_NONE][LF_TCP] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_L4_TCP,
-       [LC_IPV4_OPT][LE_NONE][LF_UDP] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_L4_UDP,
-       [LC_IPV4_OPT][LE_NONE][LF_GRE] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_TUNNEL_GRE,
-       [LC_IPV4_OPT][LE_NONE][LF_UDP_GENEVE] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_TUNNEL_GENEVE,
-       [LC_IPV4_OPT][LE_NONE][LF_UDP_VXLAN] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_TUNNEL_VXLAN,
-       [LC_IPV4_OPT][LE_NONE][LF_NVGRE] =
-                               RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_TUNNEL_NVGRE,
-
-       [LC_IPV6][LE_NONE][LF_NONE] = RTE_PTYPE_L3_IPV6 | RTE_PTYPE_UNKNOWN,
-       [LC_IPV6][LE_NONE][LF_IPSEC_ESP] =
-                               RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L3_IPV4,
-       [LC_IPV6][LE_NONE][LF_IPFRAG] = RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_FRAG,
-       [LC_IPV6][LE_NONE][LF_IPCOMP] = RTE_PTYPE_L3_IPV6 | RTE_PTYPE_UNKNOWN,
-       [LC_IPV6][LE_NONE][LF_TCP] = RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP,
-       [LC_IPV6][LE_NONE][LF_UDP] = RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_UDP,
-       [LC_IPV6][LE_NONE][LF_GRE] = RTE_PTYPE_L3_IPV6 | RTE_PTYPE_TUNNEL_GRE,
-       [LC_IPV6][LE_NONE][LF_UDP_GENEVE] =
-                               RTE_PTYPE_L3_IPV6 | RTE_PTYPE_TUNNEL_GENEVE,
-       [LC_IPV6][LE_NONE][LF_UDP_VXLAN] =
-                               RTE_PTYPE_L3_IPV6 | RTE_PTYPE_TUNNEL_VXLAN,
-       [LC_IPV6][LE_NONE][LF_NVGRE] =
-                               RTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_NVGRE,
-       [LC_IPV6_OPT][LE_NONE][LF_NONE] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_UNKNOWN,
-       [LC_IPV6_OPT][LE_NONE][LF_IPSEC_ESP] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_L3_IPV4,
-       [LC_IPV6_OPT][LE_NONE][LF_IPFRAG] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_L4_FRAG,
-       [LC_IPV6_OPT][LE_NONE][LF_IPCOMP] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_UNKNOWN,
-       [LC_IPV6_OPT][LE_NONE][LF_TCP] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_L4_TCP,
-       [LC_IPV6_OPT][LE_NONE][LF_UDP] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_L4_UDP,
-       [LC_IPV6_OPT][LE_NONE][LF_GRE] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_TUNNEL_GRE,
-       [LC_IPV6_OPT][LE_NONE][LF_UDP_GENEVE] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_TUNNEL_GENEVE,
-       [LC_IPV6_OPT][LE_NONE][LF_UDP_VXLAN] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_TUNNEL_VXLAN,
-       [LC_IPV6_OPT][LE_NONE][LF_NVGRE] =
-                               RTE_PTYPE_L3_IPV6_EXT | RTE_PTYPE_TUNNEL_NVGRE,
-
-};
 
 static __rte_always_inline uint16_t __hot
 __octeontx_xmit_pkts(void *lmtline_va, void *ioreg_va, int64_t *fc_status_va,
@@ -195,10 +107,8 @@ octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 uint16_t __hot
 octeontx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 {
-       struct rte_mbuf *mbuf;
        struct octeontx_rxq *rxq;
        struct rte_event ev;
-       octtx_wqe_t *wqe;
        size_t count;
        uint16_t valid_event;
 
@@ -210,23 +120,7 @@ octeontx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
                                                        1, 0);
                if (!valid_event)
                        break;
-
-               wqe = (octtx_wqe_t *)(uintptr_t)ev.u64;
-               rte_prefetch_non_temporal(wqe);
-
-               /* Get mbuf from wqe */
-               mbuf = (struct rte_mbuf *)((uintptr_t)wqe -
-                                               OCTTX_PACKET_WQE_SKIP);
-               mbuf->packet_type =
-               ptype_table[wqe->s.w2.lcty][wqe->s.w2.lety][wqe->s.w2.lfty];
-               mbuf->data_off = RTE_PTR_DIFF(wqe->s.w3.addr, mbuf->buf_addr);
-               mbuf->pkt_len = wqe->s.w1.len;
-               mbuf->data_len = mbuf->pkt_len;
-               mbuf->nb_segs = 1;
-               mbuf->ol_flags = 0;
-               mbuf->port = rxq->port_id;
-               rte_mbuf_refcnt_set(mbuf, 1);
-               rx_pkts[count++] = mbuf;
+               rx_pkts[count++] = ev.mbuf;
        }
 
        return count; /* return number of pkts received */