Commit 7e566df6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-fixes-2020-03-24' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2020-03-24

This series introduces some fixes to mlx5 driver.

From Aya, Fixes to the RX error recovery flows
From Leon, Fix IB capability mask

Please pull and let me know if there is any problem.

For -stable v5.5
 ('net/mlx5_core: Set IB capability mask1 to fix ib_srpt connection failure')

For -stable v5.4
 ('net/mlx5e: Fix ICOSQ recovery flow with Striding RQ')
 ('net/mlx5e: Do not recover from a non-fatal syndrome')
 ('net/mlx5e: Fix missing reset of SW metadata in Striding RQ reset')
 ('net/mlx5e: Enhance ICOSQ WQE info fields')

The above patch ('net/mlx5e: Enhance ICOSQ WQE info fields')
will fail to apply cleanly on v5.4 due to a trivial contextual conflict,
but it is an important fix, do I need to do something about it or just
assume Greg will know how to handle this ?
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f13bc681 187a9830

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

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ enum { 


struct mlx5e_sq_wqe_info {

	u8  opcode;

	u8 num_wqebbs;



	/* Auxiliary data for different opcodes. */

	union {
@@ -1059,6 +1060,7 @@ int mlx5e_modify_rq_state(struct mlx5e_rq *rq, int curr_state, int next_state); 
void mlx5e_activate_rq(struct mlx5e_rq *rq);

void mlx5e_deactivate_rq(struct mlx5e_rq *rq);

void mlx5e_free_rx_descs(struct mlx5e_rq *rq);

void mlx5e_free_rx_in_progress_descs(struct mlx5e_rq *rq);

void mlx5e_activate_icosq(struct mlx5e_icosq *icosq);

void mlx5e_deactivate_icosq(struct mlx5e_icosq *icosq);

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

+1 −2
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ 


static inline bool cqe_syndrome_needs_recover(u8 syndrome)

{

	return syndrome == MLX5_CQE_SYNDROME_LOCAL_LENGTH_ERR ||

	       syndrome == MLX5_CQE_SYNDROME_LOCAL_QP_OP_ERR ||

	return syndrome == MLX5_CQE_SYNDROME_LOCAL_QP_OP_ERR ||

	       syndrome == MLX5_CQE_SYNDROME_LOCAL_PROT_ERR ||

	       syndrome == MLX5_CQE_SYNDROME_WR_FLUSH_ERR;

}

drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int mlx5e_rx_reporter_err_icosq_cqe_recover(void *ctx) 
		goto out;



	mlx5e_reset_icosq_cc_pc(icosq);

	mlx5e_free_rx_descs(rq);

	mlx5e_free_rx_in_progress_descs(rq);

	clear_bit(MLX5E_SQ_STATE_RECOVERING, &icosq->state);

	mlx5e_activate_icosq(icosq);

	mlx5e_activate_rq(rq);

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

+4 −2
Original line number Diff line number Diff line
@@ -181,11 +181,13 @@ mlx5e_tx_dma_unmap(struct device *pdev, struct mlx5e_sq_dma *dma) 


static inline void mlx5e_rqwq_reset(struct mlx5e_rq *rq)

{

	if (rq->wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ)

	if (rq->wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ) {

		mlx5_wq_ll_reset(&rq->mpwqe.wq);

	else

		rq->mpwqe.actual_wq_head = 0;

	} else {

		mlx5_wq_cyc_reset(&rq->wqe.wq);

	}

}



/* SW parser related functions */

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

+24 −7
Original line number Diff line number Diff line
@@ -813,22 +813,39 @@ int mlx5e_wait_for_min_rx_wqes(struct mlx5e_rq *rq, int wait_time) 
	return -ETIMEDOUT;

}



void mlx5e_free_rx_descs(struct mlx5e_rq *rq)

void mlx5e_free_rx_in_progress_descs(struct mlx5e_rq *rq)

{

	__be16 wqe_ix_be;

	u16 wqe_ix;



	if (rq->wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ) {

		struct mlx5_wq_ll *wq = &rq->mpwqe.wq;

		u16 head = wq->head;

	struct mlx5_wq_ll *wq;

	u16 head;

	int i;



	if (rq->wq_type != MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ)

		return;



	wq = &rq->mpwqe.wq;

	head = wq->head;



	/* Outstanding UMR WQEs (in progress) start at wq->head */

	for (i = 0; i < rq->mpwqe.umr_in_progress; i++) {

		rq->dealloc_wqe(rq, head);

		head = mlx5_wq_ll_get_wqe_next_ix(wq, head);

	}



	rq->mpwqe.actual_wq_head = wq->head;

	rq->mpwqe.umr_in_progress = 0;

	rq->mpwqe.umr_completed = 0;

}



void mlx5e_free_rx_descs(struct mlx5e_rq *rq)

{

	__be16 wqe_ix_be;

	u16 wqe_ix;



	if (rq->wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ) {

		struct mlx5_wq_ll *wq = &rq->mpwqe.wq;



		mlx5e_free_rx_in_progress_descs(rq);



		while (!mlx5_wq_ll_is_empty(wq)) {

			struct mlx5e_rx_wqe_ll *wqe;

CRA Git | Maintained and supported by SUSTech CRA and CCSE