From: Long Wu <long...@corigine.com>
NFP will support NFDk vector Tx function, so move some
functions to header file for use by vector Tx function.
Signed-off-by: Long Wu <long...@corigine.com>
Reviewed-by: Chaoyong He <chaoyong...@corigine.com>
---
drivers/net/nfp/nfdk/nfp_nfdk.h | 45 ++++++++++++++++++++++++++++++
drivers/net/nfp/nfdk/nfp_nfdk_dp.c | 43 +---------------------------
2 files changed, 46 insertions(+), 42 deletions(-)
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk.h b/drivers/net/nfp/nfdk/nfp_nfdk.h
index 2767fd51cd..89a98d13f3 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk.h
+++ b/drivers/net/nfp/nfdk/nfp_nfdk.h
@@ -6,7 +6,10 @@
#ifndef __NFP_NFDK_H__
#define __NFP_NFDK_H__
+#include <nfp_platform.h>
+
#include "../nfp_rxtx.h"
+#include "nfp_net_common.h"
#define NFDK_TX_DESC_PER_SIMPLE_PKT 2
@@ -161,6 +164,45 @@ nfp_net_nfdk_txq_full(struct nfp_net_txq *txq)
return (nfp_net_nfdk_free_tx_desc(txq) < txq->tx_free_thresh);
}
+static inline uint16_t
+nfp_net_nfdk_headlen_to_segs(uint16_t headlen)
+{
+ /* First descriptor fits less data, so adjust for that */
+ return DIV_ROUND_UP(headlen + NFDK_TX_MAX_DATA_PER_DESC -
NFDK_TX_MAX_DATA_PER_HEAD,
+ NFDK_TX_MAX_DATA_PER_DESC);
+}
+
+/* Set TX CSUM offload flags in TX descriptor of nfdk */
+static inline uint64_t
+nfp_net_nfdk_tx_cksum(struct nfp_net_txq *txq,
+ struct rte_mbuf *mb,
+ uint64_t flags)
+{
+ uint64_t ol_flags;
+ struct nfp_net_hw *hw = txq->hw;
+
+ if ((hw->super.cap & NFP_NET_CFG_CTRL_TXCSUM) == 0)
+ return flags;
+
+ ol_flags = mb->ol_flags;
+
+ /* Set TCP csum offload if TSO enabled. */
+ if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0)
+ flags |= NFDK_DESC_TX_L4_CSUM;
+
+ if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0)
+ flags |= NFDK_DESC_TX_ENCAP;
+
+ /* IPv6 does not need checksum */
+ if ((ol_flags & RTE_MBUF_F_TX_IP_CKSUM) != 0)
+ flags |= NFDK_DESC_TX_L3_CSUM;
+
+ if ((ol_flags & RTE_MBUF_F_TX_L4_MASK) != 0)
+ flags |= NFDK_DESC_TX_L4_CSUM;
+
+ return flags;
+}
+
uint32_t nfp_flower_nfdk_pkt_add_metadata(struct rte_mbuf *mbuf,
uint32_t port_id);
uint16_t nfp_net_nfdk_xmit_pkts_common(void *tx_queue,
@@ -177,5 +219,8 @@ int nfp_net_nfdk_tx_queue_setup(struct rte_eth_dev *dev,
const struct rte_eth_txconf *tx_conf);
int nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,
struct rte_mbuf *pkt);
+int nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
+ struct nfp_net_txq *txq,
+ uint64_t *metadata);
#endif /* __NFP_NFDK_H__ */
diff --git a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
index 8b8c191b82..173aabf0b9 100644
--- a/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
+++ b/drivers/net/nfp/nfdk/nfp_nfdk_dp.c
@@ -6,7 +6,6 @@
#include "nfp_nfdk.h"
#include <bus_pci_driver.h>
-#include <nfp_platform.h>
#include <rte_malloc.h>
#include "../flower/nfp_flower.h"
@@ -15,38 +14,6 @@
#define NFDK_TX_DESC_GATHER_MAX 17
-/* Set TX CSUM offload flags in TX descriptor of nfdk */
-static uint64_t
-nfp_net_nfdk_tx_cksum(struct nfp_net_txq *txq,
- struct rte_mbuf *mb,
- uint64_t flags)
-{
- uint64_t ol_flags;
- struct nfp_net_hw *hw = txq->hw;
-
- if ((hw->super.ctrl & NFP_NET_CFG_CTRL_TXCSUM) == 0)
- return flags;
-
- ol_flags = mb->ol_flags;
-
- /* Set L4 csum offload if TSO/UFO enabled. */
- if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0 ||
- (ol_flags & RTE_MBUF_F_TX_UDP_SEG) != 0)
- flags |= NFDK_DESC_TX_L4_CSUM;
-
- if ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) != 0)
- flags |= NFDK_DESC_TX_ENCAP;
-
- /* IPv6 does not need checksum */
- if ((ol_flags & RTE_MBUF_F_TX_IP_CKSUM) != 0)
- flags |= NFDK_DESC_TX_L3_CSUM;
-
- if ((ol_flags & RTE_MBUF_F_TX_L4_MASK) != 0)
- flags |= NFDK_DESC_TX_L4_CSUM;
-
- return flags;
-}
-
/* Set TX descriptor for TSO of nfdk */
static uint64_t
nfp_net_nfdk_tx_tso(struct nfp_net_txq *txq,
@@ -100,14 +67,6 @@ nfp_flower_nfdk_pkt_add_metadata(struct rte_mbuf *mbuf,
return FLOWER_PKT_DATA_OFFSET;
}
-static inline uint16_t
-nfp_net_nfdk_headlen_to_segs(uint16_t headlen)
-{
- /* First descriptor fits less data, so adjust for that */
- return DIV_ROUND_UP(headlen + NFDK_TX_MAX_DATA_PER_DESC -
NFDK_TX_MAX_DATA_PER_HEAD,
- NFDK_TX_MAX_DATA_PER_DESC);
-}
-
static inline void
nfp_net_nfdk_tx_close_block(struct nfp_net_txq *txq,
uint32_t nop_slots)
@@ -170,7 +129,7 @@ nfp_net_nfdk_tx_maybe_close_block(struct nfp_net_txq *txq,
return nop_slots;
}
-static int
+int
nfp_net_nfdk_set_meta_data(struct rte_mbuf *pkt,
struct nfp_net_txq *txq,
uint64_t *metadata)
--
2.39.1
