Commit 7d42c8e9 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Rename ICOSQ WQE info struct and field 



Structs mlx5e_txqsq and mlx5e_xdpsq contain wqe_info arrays to store
supplementary information corresponding to WQEs in the queue. Struct
mlx5e_icosq also has such an array, but it's called differently -
ico_wqe. This patch renames it to unify with the other SQs.

In addition, rename the struct to emphasize its specific usage.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ enum { 
	MLX5E_SQ_STATE_PENDING_XSK_TX,

};



struct mlx5e_sq_wqe_info {

struct mlx5e_icosq_wqe_info {

	u8  opcode;

	u8 num_wqebbs;
@@ -552,7 +552,7 @@ struct mlx5e_icosq { 


	/* write@xmit, read@completion */

	struct {

		struct mlx5e_sq_wqe_info *ico_wqe;

		struct mlx5e_icosq_wqe_info *wqe_info;

	} db;



	/* read only */

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+5 −5
Original line number Diff line number Diff line
@@ -1027,17 +1027,17 @@ static void mlx5e_free_xdpsq(struct mlx5e_xdpsq *sq) 


static void mlx5e_free_icosq_db(struct mlx5e_icosq *sq)

{

	kvfree(sq->db.ico_wqe);

	kvfree(sq->db.wqe_info);

}



static int mlx5e_alloc_icosq_db(struct mlx5e_icosq *sq, int numa)

{

	int wq_sz = mlx5_wq_cyc_get_size(&sq->wq);

	size_t size;



	sq->db.ico_wqe = kvzalloc_node(array_size(wq_sz,

						  sizeof(*sq->db.ico_wqe)),

				       GFP_KERNEL, numa);

	if (!sq->db.ico_wqe)

	size = array_size(wq_sz, sizeof(*sq->db.wqe_info));

	sq->db.wqe_info = kvzalloc_node(size, GFP_KERNEL, numa);

	if (!sq->db.wqe_info)

		return -ENOMEM;



	return 0;

drivers/net/ethernet/mellanox/mlx5/core/en_rx.c

+6 −6
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ static inline void mlx5e_fill_icosq_frag_edge(struct mlx5e_icosq *sq, 
					      struct mlx5_wq_cyc *wq,

					      u16 pi, u16 nnops)

{

	struct mlx5e_sq_wqe_info *edge_wi, *wi = &sq->db.ico_wqe[pi];

	struct mlx5e_icosq_wqe_info *edge_wi, *wi = &sq->db.wqe_info[pi];



	edge_wi = wi + nnops;
@@ -527,9 +527,9 @@ static int mlx5e_alloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix) 
			    MLX5_OPCODE_UMR);

	umr_wqe->uctrl.xlt_offset = cpu_to_be16(xlt_offset);



	sq->db.ico_wqe[pi].opcode = MLX5_OPCODE_UMR;

	sq->db.ico_wqe[pi].num_wqebbs = MLX5E_UMR_WQEBBS;

	sq->db.ico_wqe[pi].umr.rq = rq;

	sq->db.wqe_info[pi].opcode = MLX5_OPCODE_UMR;

	sq->db.wqe_info[pi].num_wqebbs = MLX5E_UMR_WQEBBS;

	sq->db.wqe_info[pi].umr.rq = rq;

	sq->pc += MLX5E_UMR_WQEBBS;



	sq->doorbell_cseg = &umr_wqe->ctrl;
@@ -618,13 +618,13 @@ int mlx5e_poll_ico_cq(struct mlx5e_cq *cq) 
		wqe_counter = be16_to_cpu(cqe->wqe_counter);



		do {

			struct mlx5e_sq_wqe_info *wi;

			struct mlx5e_icosq_wqe_info *wi;

			u16 ci;



			last_wqe = (sqcc == wqe_counter);



			ci = mlx5_wq_cyc_ctr2ix(&sq->wq, sqcc);

			wi = &sq->db.ico_wqe[ci];

			wi = &sq->db.wqe_info[ci];

			sqcc += wi->num_wqebbs;



			if (last_wqe && unlikely(get_cqe_opcode(cqe) != MLX5_CQE_REQ)) {

drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c

+2 −2
Original line number Diff line number Diff line
@@ -78,8 +78,8 @@ void mlx5e_trigger_irq(struct mlx5e_icosq *sq) 
	struct mlx5e_tx_wqe *nopwqe;

	u16 pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);



	sq->db.ico_wqe[pi].opcode = MLX5_OPCODE_NOP;

	sq->db.ico_wqe[pi].num_wqebbs = 1;

	sq->db.wqe_info[pi].opcode = MLX5_OPCODE_NOP;

	sq->db.wqe_info[pi].num_wqebbs = 1;

	nopwqe = mlx5e_post_nop(wq, sq->sqn, &sq->pc);

	mlx5e_notify_hw(wq, sq->pc, sq->uar_map, &nopwqe->ctrl);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE