Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6254adeb authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5: Use helper to get CQE opcode 



Introduce and use a helper that extracts the opcode
from a CQE (completion queue entry) structure.

Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent fe206c20

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -554,9 +554,9 @@ static inline void mlx5e_poll_ico_single_cqe(struct mlx5e_cq *cq, 




	mlx5_cqwq_pop(&cq->wq);

	mlx5_cqwq_pop(&cq->wq);





	if (unlikely((cqe->op_own >> 4) != MLX5_CQE_REQ)) {

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

		netdev_WARN_ONCE(cq->channel->netdev,

		netdev_WARN_ONCE(cq->channel->netdev,

				 "Bad OP in ICOSQ CQE: 0x%x\n", cqe->op_own);

				 "Bad OP in ICOSQ CQE: 0x%x\n", get_cqe_opcode(cqe));

		return;

		return;

	}

	}
@@ -898,7 +898,7 @@ mlx5e_skb_from_cqe_linear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe, 
	prefetchw(va); /* xdp_frame data area */

	prefetchw(va); /* xdp_frame data area */

	prefetch(data);

	prefetch(data);





	if (unlikely((cqe->op_own >> 4) != MLX5_CQE_RESP_SEND)) {

	if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_RESP_SEND)) {

		rq->stats->wqe_err++;

		rq->stats->wqe_err++;

		return NULL;

		return NULL;

	}

	}
@@ -930,7 +930,7 @@ mlx5e_skb_from_cqe_nonlinear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe, 
	u16 byte_cnt     = cqe_bcnt - headlen;

	u16 byte_cnt     = cqe_bcnt - headlen;

	struct sk_buff *skb;

	struct sk_buff *skb;





	if (unlikely((cqe->op_own >> 4) != MLX5_CQE_RESP_SEND)) {

	if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_RESP_SEND)) {

		rq->stats->wqe_err++;

		rq->stats->wqe_err++;

		return NULL;

		return NULL;

	}

	}
@@ -1148,7 +1148,7 @@ void mlx5e_handle_rx_cqe_mpwrq(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) 




	wi->consumed_strides += cstrides;

	wi->consumed_strides += cstrides;





	if (unlikely((cqe->op_own >> 4) != MLX5_CQE_RESP_SEND)) {

	if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_RESP_SEND)) {

		rq->stats->wqe_err++;

		rq->stats->wqe_err++;

		goto mpwrq_cqe_out;

		goto mpwrq_cqe_out;

	}

	}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -507,7 +507,7 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget) 




		wqe_counter = be16_to_cpu(cqe->wqe_counter);

		wqe_counter = be16_to_cpu(cqe->wqe_counter);





		if (unlikely(cqe->op_own >> 4 == MLX5_CQE_REQ_ERR)) {

		if (unlikely(get_cqe_opcode(cqe) == MLX5_CQE_REQ_ERR)) {

			if (!test_and_set_bit(MLX5E_SQ_STATE_RECOVERING,

			if (!test_and_set_bit(MLX5E_SQ_STATE_RECOVERING,

					      &sq->state)) {

					      &sq->state)) {

				mlx5e_dump_error_cqe(sq,

				mlx5e_dump_error_cqe(sq,

drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -334,7 +334,7 @@ static void mlx5_fpga_conn_handle_cqe(struct mlx5_fpga_conn *conn, 
{

{

	u8 opcode, status = 0;

	u8 opcode, status = 0;





	opcode = cqe->op_own >> 4;

	opcode = get_cqe_opcode(cqe);





	switch (opcode) {

	switch (opcode) {

	case MLX5_CQE_REQ_ERR:

	case MLX5_CQE_REQ_ERR:

include/linux/mlx5/device.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -781,6 +781,11 @@ static inline u8 mlx5_get_cqe_format(struct mlx5_cqe64 *cqe) 
	return (cqe->op_own >> 2) & 0x3;

	return (cqe->op_own >> 2) & 0x3;

}

}





static inline u8 get_cqe_opcode(struct mlx5_cqe64 *cqe)

{

	return cqe->op_own >> 4;

}



static inline u8 get_cqe_lro_tcppsh(struct mlx5_cqe64 *cqe)

static inline u8 get_cqe_lro_tcppsh(struct mlx5_cqe64 *cqe)

{

{

	return (cqe->lro_tcppsh_abort_dupack >> 6) & 1;

	return (cqe->lro_tcppsh_abort_dupack >> 6) & 1;