net/sfc: factor out libefx-based Tx datapath

[dpdk.git] / drivers / net / sfc / sfc_tx.h

diff --git a/drivers/net/sfc/sfc_tx.h b/drivers/net/sfc/sfc_tx.h
index 39977a5..94477f7 100644 (file)
--- a/drivers/net/sfc/sfc_tx.h
+++ b/drivers/net/sfc/sfc_tx.h
@@ -1,5 +1,7 @@
 /*-
- * Copyright (c) 2016 Solarflare Communications Inc.
+ *   BSD LICENSE
+ *
+ * Copyright (c) 2016-2017 Solarflare Communications Inc.
  * All rights reserved.
  *
  * This software was jointly developed between OKTET Labs (under contract
@@ -35,20 +37,20 @@
 
 #include "efx.h"
 
+#include "sfc_dp_tx.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/**
- * A segment must not cross 4K boundary
- * (this is a requirement of NIC TX descriptors)
- */
-#define SFC_TX_SEG_BOUNDARY    4096
-
 struct sfc_adapter;
 struct sfc_evq;
 
-struct sfc_tx_sw_desc {
+/**
+ * Software Tx descriptor information associated with hardware Tx
+ * descriptor.
+ */
+struct sfc_efx_tx_sw_desc {
        struct rte_mbuf         *mbuf;
        uint8_t                 *tsoh;  /* Buffer to store TSO header */
 };
@@ -58,36 +60,71 @@ enum sfc_txq_state_bit {
 #define SFC_TXQ_INITIALIZED    (1 << SFC_TXQ_INITIALIZED_BIT)
        SFC_TXQ_STARTED_BIT,
 #define SFC_TXQ_STARTED                (1 << SFC_TXQ_STARTED_BIT)
-       SFC_TXQ_RUNNING_BIT,
-#define SFC_TXQ_RUNNING                (1 << SFC_TXQ_RUNNING_BIT)
        SFC_TXQ_FLUSHING_BIT,
 #define SFC_TXQ_FLUSHING       (1 << SFC_TXQ_FLUSHING_BIT)
        SFC_TXQ_FLUSHED_BIT,
 #define SFC_TXQ_FLUSHED                (1 << SFC_TXQ_FLUSHED_BIT)
 };
 
+/**
+ * Transmit queue control information. Not used on datapath.
+ * Allocated on the socket specified on the queue setup.
+ */
 struct sfc_txq {
-       struct sfc_evq          *evq;
-       struct sfc_tx_sw_desc   *sw_ring;
-       unsigned int            state;
-       unsigned int            ptr_mask;
-       efx_desc_t              *pend_desc;
-       efx_txq_t               *common;
-       efsys_mem_t             mem;
-       unsigned int            added;
-       unsigned int            pending;
-       unsigned int            completed;
-       unsigned int            free_thresh;
-       uint16_t                hw_vlan_tci;
-
-       unsigned int            hw_index;
-       unsigned int            flags;
+       unsigned int                    state;
+       unsigned int                    hw_index;
+       struct sfc_evq                  *evq;
+       efsys_mem_t                     mem;
+       struct sfc_dp_txq               *dp;
+       efx_txq_t                       *common;
+       unsigned int                    free_thresh;
+       unsigned int                    flags;
 };
 
+static inline unsigned int
+sfc_txq_sw_index_by_hw_index(unsigned int hw_index)
+{
+       return hw_index;
+}
+
 static inline unsigned int
 sfc_txq_sw_index(const struct sfc_txq *txq)
 {
-       return txq->hw_index;
+       return sfc_txq_sw_index_by_hw_index(txq->hw_index);
+}
+
+struct sfc_txq *sfc_txq_by_dp_txq(const struct sfc_dp_txq *dp_txq);
+
+/**
+ * Transmit queue information used on libefx-based data path.
+ * Allocated on the socket specified on the queue setup.
+ */
+struct sfc_efx_txq {
+       struct sfc_evq                  *evq;
+       struct sfc_efx_tx_sw_desc       *sw_ring;
+       unsigned int                    ptr_mask;
+       efx_desc_t                      *pend_desc;
+       efx_txq_t                       *common;
+       unsigned int                    added;
+       unsigned int                    pending;
+       unsigned int                    completed;
+       unsigned int                    free_thresh;
+       uint16_t                        hw_vlan_tci;
+       uint16_t                        dma_desc_size_max;
+
+       unsigned int                    hw_index;
+       unsigned int                    flags;
+#define SFC_EFX_TXQ_FLAG_STARTED       0x1
+#define SFC_EFX_TXQ_FLAG_RUNNING       0x2
+
+       /* Datapath transmit queue anchor */
+       struct sfc_dp_txq               dp;
+};
+
+static inline struct sfc_efx_txq *
+sfc_efx_txq_by_dp_txq(struct sfc_dp_txq *dp_txq)
+{
+       return container_of(dp_txq, struct sfc_efx_txq, dp);
 }
 
 struct sfc_txq_info {
@@ -111,17 +148,15 @@ void sfc_tx_qstop(struct sfc_adapter *sa, unsigned int sw_index);
 int sfc_tx_start(struct sfc_adapter *sa);
 void sfc_tx_stop(struct sfc_adapter *sa);
 
-uint16_t sfc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
-                      uint16_t nb_pkts);
-
 /* From 'sfc_tso.c' */
-int sfc_tso_alloc_tsoh_objs(struct sfc_tx_sw_desc *sw_ring,
-                           unsigned int txq_entries, unsigned int socket_id);
-void sfc_tso_free_tsoh_objs(struct sfc_tx_sw_desc *sw_ring,
-                           unsigned int txq_entries);
-int sfc_tso_do(struct sfc_txq *txq, unsigned int idx, struct rte_mbuf **in_seg,
-              size_t *in_off, efx_desc_t **pend, unsigned int *pkt_descs,
-              size_t *pkt_len);
+int sfc_efx_tso_alloc_tsoh_objs(struct sfc_efx_tx_sw_desc *sw_ring,
+                               unsigned int txq_entries,
+                               unsigned int socket_id);
+void sfc_efx_tso_free_tsoh_objs(struct sfc_efx_tx_sw_desc *sw_ring,
+                               unsigned int txq_entries);
+int sfc_efx_tso_do(struct sfc_efx_txq *txq, unsigned int idx,
+                  struct rte_mbuf **in_seg, size_t *in_off, efx_desc_t **pend,
+                  unsigned int *pkt_descs, size_t *pkt_len);
 
 #ifdef __cplusplus
 }