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

Commit a1f5a1a8 authored by Achiad Shochat's avatar Achiad Shochat Committed by David S. Miller
Browse files

net/mlx5e: Pop cq outside mlx5e_get_cqe 



Separate between mlx5e_get_cqe() and mlx5_cqwq_pop(), this helps for
better code readability and better CQ buffer management.

Signed-off-by: default avatarAchiad Shochat <achiad@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3391054

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

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,8 @@ bool mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget) 
		if (!cqe)

			break;



		mlx5_cqwq_pop(&cq->wq);



		wqe_counter_be = cqe->wqe_counter;

		wqe_counter    = be16_to_cpu(wqe_counter_be);

		wqe            = mlx5_wq_ll_get_wqe(&rq->wq, wqe_counter);

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

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq) 
		if (!cqe)

			break;



		mlx5_cqwq_pop(&cq->wq);



		wqe_counter = be16_to_cpu(cqe->wqe_counter);



		do {

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

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ struct mlx5_cqe64 *mlx5e_get_cqe(struct mlx5e_cq *cq) 
	if (cqe_ownership_bit != sw_ownership_val)

		return NULL;



	mlx5_cqwq_pop(wq);



	/* ensure cqe content is read after cqe ownership bit */

	rmb();