net/mlx5: support GTP

[dpdk.git] / drivers / net / mlx5 / mlx5_rxtx.h

diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index e927343..3f659d2 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -40,7 +40,7 @@
 #include "mlx5_glue.h"
 
 /* Support tunnel matching. */
-#define MLX5_FLOW_TUNNEL 9
+#define MLX5_FLOW_TUNNEL 10
 
 struct mlx5_rxq_stats {
 #ifdef MLX5_PMD_SOFT_COUNTERS
@@ -144,7 +144,7 @@ struct mlx5_rxq_data {
        struct mlx5_mprq_buf *mprq_repl; /* Stashed mbuf for replenish. */
        uint16_t idx; /* Queue index. */
        struct mlx5_rxq_stats stats;
-       uint64_t mbuf_initializer; /* Default rearm_data for vectorized Rx. */
+       rte_xmm_t mbuf_initializer; /* Default rearm/flags for vectorized Rx. */
        struct rte_mbuf fake_mbuf; /* elts padding for vectorized Rx. */
        void *cq_uar; /* CQ user access region. */
        uint32_t cqn; /* CQ number. */
@@ -273,9 +273,7 @@ struct mlx5_txq_data {
        uint16_t wqe_thres; /* WQE threshold to request completion in CQ. */
        /* WQ related fields. */
        uint16_t cq_ci; /* Consumer index for completion queue. */
-#ifndef NDEBUG
-       uint16_t cq_pi; /* Counter of issued CQE "always" requests. */
-#endif
+       uint16_t cq_pi; /* Production index for completion queue. */
        uint16_t cqe_s; /* Number of CQ elements. */
        uint16_t cqe_m; /* Mask for CQ indices. */
        /* CQ related fields. */
@@ -297,6 +295,11 @@ struct mlx5_txq_data {
        struct mlx5_mr_ctrl mr_ctrl; /* MR control descriptor. */
        struct mlx5_wqe *wqes; /* Work queue. */
        struct mlx5_wqe *wqes_end; /* Work queue array limit. */
+#ifdef NDEBUG
+       uint16_t *fcqs; /* Free completion queue. */
+#else
+       uint32_t *fcqs; /* Free completion queue (debug extended). */
+#endif
        volatile struct mlx5_cqe *cqes; /* Completion queue. */
        volatile uint32_t *qp_db; /* Work queue doorbell. */
        volatile uint32_t *cq_db; /* Completion queue doorbell. */
@@ -440,6 +443,7 @@ int mlx5_txq_release(struct rte_eth_dev *dev, uint16_t idx);
 int mlx5_txq_releasable(struct rte_eth_dev *dev, uint16_t idx);
 int mlx5_txq_verify(struct rte_eth_dev *dev);
 void txq_alloc_elts(struct mlx5_txq_ctrl *txq_ctrl);
+void txq_free_elts(struct mlx5_txq_ctrl *txq_ctrl);
 uint64_t mlx5_get_tx_port_offloads(struct rte_eth_dev *dev);
 
 /* mlx5_rxtx.c */
@@ -451,9 +455,6 @@ extern uint8_t mlx5_swp_types_table[];
 void mlx5_set_ptype_table(void);
 void mlx5_set_cksum_table(void);
 void mlx5_set_swp_types_table(void);
-__rte_noinline int mlx5_tx_error_cqe_handle
-                               (struct mlx5_txq_data *restrict txq,
-                                volatile struct mlx5_err_cqe *err_cqe);
 uint16_t mlx5_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n);
 void mlx5_rxq_initialize(struct mlx5_rxq_data *rxq);
 __rte_noinline int mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec);