Commit 7822dee5 authored by David S. Miller's avatar David S. Miller
Browse files

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



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2020-02-18

This series introduces some fixes to mlx5 driver.

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

For -stable v5.3
 ('net/mlx5: Fix sleep while atomic in mlx5_eswitch_get_vepa')

For -stable v5.4
 ('net/mlx5: DR, Fix matching on vport gvmi')
 ('net/mlx5e: Fix crash in recovery flow without devlink reporter')

For -stable v5.5
 ('net/mlx5e: Reset RQ doorbell counter before moving RQ state from RST to RDY')
 ('net/mlx5e: Don't clear the whole vf config when switching modes')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7c8c1697 13a7e459

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

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ int mlx5e_health_report(struct mlx5e_priv *priv, 
	netdev_err(priv->netdev, err_str);



	if (!reporter)

		return err_ctx->recover(&err_ctx->ctx);

		return err_ctx->recover(err_ctx->ctx);



	return devlink_health_report(reporter, err_str, err_ctx);

}

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

+8 −0
Original line number Diff line number Diff line
@@ -179,6 +179,14 @@ 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)

		mlx5_wq_ll_reset(&rq->mpwqe.wq);

	else

		mlx5_wq_cyc_reset(&rq->wqe.wq);

}



/* SW parser related functions */



struct mlx5e_swp_spec {

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

+3 −0
Original line number Diff line number Diff line
@@ -712,6 +712,9 @@ int mlx5e_modify_rq_state(struct mlx5e_rq *rq, int curr_state, int next_state) 
	if (!in)

		return -ENOMEM;



	if (curr_state == MLX5_RQC_STATE_RST && next_state == MLX5_RQC_STATE_RDY)

		mlx5e_rqwq_reset(rq);



	rqc = MLX5_ADDR_OF(modify_rq_in, in, ctx);



	MLX5_SET(modify_rq_in, in, rq_state, curr_state);

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

+8 −12
Original line number Diff line number Diff line
@@ -459,12 +459,16 @@ static void esw_destroy_legacy_table(struct mlx5_eswitch *esw) 


static int esw_legacy_enable(struct mlx5_eswitch *esw)

{

	int ret;

	struct mlx5_vport *vport;

	int ret, i;



	ret = esw_create_legacy_table(esw);

	if (ret)

		return ret;



	mlx5_esw_for_each_vf_vport(esw, i, vport, esw->esw_funcs.num_vfs)

		vport->info.link_state = MLX5_VPORT_ADMIN_STATE_AUTO;



	ret = mlx5_eswitch_enable_pf_vf_vports(esw, MLX5_LEGACY_SRIOV_VPORT_EVENTS);

	if (ret)

		esw_destroy_legacy_table(esw);
@@ -2452,25 +2456,17 @@ out: 


int mlx5_eswitch_get_vepa(struct mlx5_eswitch *esw, u8 *setting)

{

	int err = 0;



	if (!esw)

		return -EOPNOTSUPP;



	if (!ESW_ALLOWED(esw))

		return -EPERM;



	mutex_lock(&esw->state_lock);

	if (esw->mode != MLX5_ESWITCH_LEGACY) {

		err = -EOPNOTSUPP;

		goto out;

	}

	if (esw->mode != MLX5_ESWITCH_LEGACY)

		return -EOPNOTSUPP;



	*setting = esw->fdb_table.legacy.vepa_uplink_rule ? 1 : 0;



out:

	mutex_unlock(&esw->state_lock);

	return err;

	return 0;

}



int mlx5_eswitch_set_vport_trust(struct mlx5_eswitch *esw,

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

+2 −2
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ static int esw_offloads_start(struct mlx5_eswitch *esw, 
		return -EINVAL;

	}



	mlx5_eswitch_disable(esw, true);

	mlx5_eswitch_disable(esw, false);

	mlx5_eswitch_update_num_of_vfs(esw, esw->dev->priv.sriov.num_vfs);

	err = mlx5_eswitch_enable(esw, MLX5_ESWITCH_OFFLOADS);

	if (err) {
@@ -2065,7 +2065,7 @@ static int esw_offloads_stop(struct mlx5_eswitch *esw, 
{

	int err, err1;



	mlx5_eswitch_disable(esw, true);

	mlx5_eswitch_disable(esw, false);

	err = mlx5_eswitch_enable(esw, MLX5_ESWITCH_LEGACY);

	if (err) {

		NL_SET_ERR_MSG_MOD(extack, "Failed setting eswitch to legacy");

CRA Git | Maintained and supported by SUSTech CRA and CCSE