Commit 41a8e4eb authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: Use struct assignment for WQE info updates 



Struct assignment looks more clean, and implies resetting
the not assigned fields to zero, instead of holding values
from older ring cycles.

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 05dfd570

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c

+5 −4
Original line number Diff line number Diff line
@@ -108,10 +108,11 @@ static void tx_fill_wi(struct mlx5e_txqsq *sq, 
{

	struct mlx5e_tx_wqe_info *wi = &sq->db.wqe_info[pi];



	memset(wi, 0, sizeof(*wi));

	wi->num_wqebbs = num_wqebbs;

	wi->num_bytes  = num_bytes;

	wi->resync_dump_frag_page = page;

	*wi = (struct mlx5e_tx_wqe_info) {

		.num_wqebbs = num_wqebbs,

		.num_bytes  = num_bytes,

		.resync_dump_frag_page = page,

	};

}



void mlx5e_ktls_tx_offload_set_pending(struct mlx5e_ktls_offload_context_tx *priv_tx)

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

+8 −8
Original line number Diff line number Diff line
@@ -1364,13 +1364,12 @@ static void mlx5e_deactivate_txqsq(struct mlx5e_txqsq *sq) 
	/* last doorbell out, godspeed .. */

	if (mlx5e_wqc_has_room_for(wq, sq->cc, sq->pc, 1)) {

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

		struct mlx5e_tx_wqe_info *wi;

		struct mlx5e_tx_wqe *nop;



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

		sq->db.wqe_info[pi] = (struct mlx5e_tx_wqe_info) {

			.num_wqebbs = 1,

		};



		memset(wi, 0, sizeof(*wi));

		wi->num_wqebbs = 1;

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

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

	}
@@ -1482,20 +1481,21 @@ int mlx5e_open_xdpsq(struct mlx5e_channel *c, struct mlx5e_params *params, 


		/* Pre initialize fixed WQE fields */

		for (i = 0; i < mlx5_wq_cyc_get_size(&sq->wq); i++) {

			struct mlx5e_xdp_wqe_info *wi  = &sq->db.wqe_info[i];

			struct mlx5e_tx_wqe      *wqe  = mlx5_wq_cyc_get_wqe(&sq->wq, i);

			struct mlx5_wqe_ctrl_seg *cseg = &wqe->ctrl;

			struct mlx5_wqe_eth_seg  *eseg = &wqe->eth;

			struct mlx5_wqe_data_seg *dseg;



			sq->db.wqe_info[i] = (struct mlx5e_xdp_wqe_info) {

				.num_wqebbs = 1,

				.num_pkts   = 1,

			};



			cseg->qpn_ds = cpu_to_be32((sq->sqn << 8) | ds_cnt);

			eseg->inline_hdr.sz = cpu_to_be16(inline_hdr_sz);



			dseg = (struct mlx5_wqe_data_seg *)cseg + (ds_cnt - 1);

			dseg->lkey = sq->mkey_be;



			wi->num_wqebbs = 1;

			wi->num_pkts   = 1;

		}

	}

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

+6 −3
Original line number Diff line number Diff line
@@ -505,9 +505,12 @@ 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.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->db.wqe_info[pi] = (struct mlx5e_icosq_wqe_info) {

		.opcode     = MLX5_OPCODE_UMR,

		.num_wqebbs = MLX5E_UMR_WQEBBS,

		.umr.rq     = rq,

	};



	sq->pc += MLX5E_UMR_WQEBBS;



	sq->doorbell_cseg = &umr_wqe->ctrl;

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

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

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



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

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

	sq->db.wqe_info[pi] = (struct mlx5e_icosq_wqe_info) {

		.opcode     = MLX5_OPCODE_NOP,

		.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