ethdev: separate driver APIs
[dpdk.git] / drivers / net / octeontx / octeontx_rxtx.c
index 0b15833..2502d90 100644 (file)
@@ -1,33 +1,5 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright (C) Cavium, Inc. 2017. All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Cavium, Inc nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017 Cavium, Inc
  */
 
 #include <stdint.h>
@@ -37,7 +9,7 @@
 
 #include <rte_atomic.h>
 #include <rte_common.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_ether.h>
 #include <rte_log.h>
 #include <rte_mbuf.h>
 #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,
@@ -158,7 +42,7 @@ __octeontx_xmit_pkts(void *lmtline_va, void *ioreg_va, int64_t *fc_status_va,
                cmd_buf[0] |= (1ULL << 58); /* SET DF */
 
        /* Setup PKO_SEND_GATHER_S */
-       cmd_buf[(1 << 1) | 1] = rte_mbuf_data_dma_addr(tx_pkt);
+       cmd_buf[(1 << 1) | 1] = rte_mbuf_data_iova(tx_pkt);
        cmd_buf[(1 << 1) | 0] = PKO_SEND_GATHER_SUBDC |
                                PKO_SEND_GATHER_LDTYPE(0x1ull) |
                                PKO_SEND_GATHER_GAUAR((long)gaura_id) |
@@ -195,10 +79,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 +92,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 */