Commit 05dfd570 authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Take TX WQE info structures out of general EN header 



Into the txrx header file.
The mlx5e_sq_wqe_info structure describes WQE info for the ICOSQ,
rename it to better reflect this.

Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Reviewed-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent f713ce1d

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −27
Original line number Diff line number Diff line
@@ -339,16 +339,6 @@ struct mlx5e_cq_decomp { 
	u16                        wqe_counter;

} ____cacheline_aligned_in_smp;



struct mlx5e_tx_wqe_info {

	struct sk_buff *skb;

	u32 num_bytes;

	u8  num_wqebbs;

	u8  num_dma;

#ifdef CONFIG_MLX5_EN_TLS

	struct page *resync_dump_frag_page;

#endif

};



enum mlx5e_dma_map_type {

	MLX5E_DMA_MAP_SINGLE,

	MLX5E_DMA_MAP_PAGE
@@ -370,18 +360,6 @@ enum { 
	MLX5E_SQ_STATE_PENDING_XSK_TX,

};



struct mlx5e_icosq_wqe_info {

	u8  opcode;

	u8 num_wqebbs;



	/* Auxiliary data for different opcodes. */

	union {

		struct {

			struct mlx5e_rq *rq;

		} umr;

	};

};



struct mlx5e_txqsq {

	/* data path */
@@ -484,11 +462,6 @@ struct mlx5e_xdp_info_fifo { 
	u32 mask;

};



struct mlx5e_xdp_wqe_info {

	u8 num_wqebbs;

	u8 num_pkts;

};



struct mlx5e_xdp_mpwqe {

	/* Current MPWQE session */

	struct mlx5e_tx_wqe *wqe;

drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h

+22 −0
Original line number Diff line number Diff line
@@ -81,6 +81,16 @@ mlx5e_post_nop_fence(struct mlx5_wq_cyc *wq, u32 sqn, u16 *pc) 
	return wqe;

}



struct mlx5e_tx_wqe_info {

	struct sk_buff *skb;

	u32 num_bytes;

	u8 num_wqebbs;

	u8 num_dma;

#ifdef CONFIG_MLX5_EN_TLS

	struct page *resync_dump_frag_page;

#endif

};



static inline u16 mlx5e_txqsq_get_next_pi(struct mlx5e_txqsq *sq, u16 size)

{

	struct mlx5_wq_cyc *wq = &sq->wq;
@@ -109,6 +119,18 @@ static inline u16 mlx5e_txqsq_get_next_pi(struct mlx5e_txqsq *sq, u16 size) 
	return pi;

}



struct mlx5e_icosq_wqe_info {

	u8 opcode;

	u8 num_wqebbs;



	/* Auxiliary data for different opcodes. */

	union {

		struct {

			struct mlx5e_rq *rq;

		} umr;

	};

};



static inline u16 mlx5e_icosq_get_next_pi(struct mlx5e_icosq *sq, u16 size)

{

	struct mlx5_wq_cyc *wq = &sq->wq;

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h

+5 −0
Original line number Diff line number Diff line
@@ -137,6 +137,11 @@ mlx5e_xdp_no_room_for_inline_pkt(struct mlx5e_xdp_mpwqe *session) 
	       session->ds_count + MLX5E_XDP_INLINE_WQE_MAX_DS_CNT > MLX5E_XDP_MPW_MAX_NUM_DS;

}



struct mlx5e_xdp_wqe_info {

	u8 num_wqebbs;

	u8 num_pkts;

};



static inline void

mlx5e_xdp_mpwqe_add_dseg(struct mlx5e_xdpsq *sq,

			 struct mlx5e_xdp_xmit_data *xdptxd,

CRA Git | Maintained and supported by SUSTech CRA and CCSE