Commit 6a279f61 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-fixes-2021-08-09' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5 fixes 2021-08-09

This series introduces fixes to mlx5 driver.
Please pull and let me know if there is any problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ea377dca bd37c288

drivers/infiniband/hw/mlx5/cq.c

+1 −3
Original line number Diff line number Diff line
@@ -945,7 +945,6 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
	u32 *cqb = NULL;

	void *cqc;

	int cqe_size;

	unsigned int irqn;

	int eqn;

	int err;
@@ -984,7 +983,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
		INIT_WORK(&cq->notify_work, notify_soft_wc_handler);

	}



	err = mlx5_vector2eqn(dev->mdev, vector, &eqn, &irqn);

	err = mlx5_vector2eqn(dev->mdev, vector, &eqn);

	if (err)

		goto err_cqb;
@@ -1007,7 +1006,6 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
		goto err_cqb;



	mlx5_ib_dbg(dev, "cqn 0x%x\n", cq->mcq.cqn);

	cq->mcq.irqn = irqn;

	if (udata)

		cq->mcq.tasklet_ctx.comp = mlx5_ib_cq_comp;

	else

drivers/infiniband/hw/mlx5/devx.c

+1 −2
Original line number Diff line number Diff line
@@ -975,7 +975,6 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)( 
	struct mlx5_ib_dev *dev;

	int user_vector;

	int dev_eqn;

	unsigned int irqn;

	int err;



	if (uverbs_copy_from(&user_vector, attrs,
@@ -987,7 +986,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)( 
		return PTR_ERR(c);

	dev = to_mdev(c->ibucontext.device);



	err = mlx5_vector2eqn(dev->mdev, user_vector, &dev_eqn, &irqn);

	err = mlx5_vector2eqn(dev->mdev, user_vector, &dev_eqn);

	if (err < 0)

		return err;

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

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ int mlx5_core_create_cq(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq, 
			      cq->cqn);



	cq->uar = dev->priv.uar;

	cq->irqn = eq->core.irqn;



	return 0;

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+9 −2
Original line number Diff line number Diff line
@@ -1019,12 +1019,19 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer) 
	MLX5_NB_INIT(&tracer->nb, fw_tracer_event, DEVICE_TRACER);

	mlx5_eq_notifier_register(dev, &tracer->nb);



	mlx5_fw_tracer_start(tracer);



	err = mlx5_fw_tracer_start(tracer);

	if (err) {

		mlx5_core_warn(dev, "FWTracer: Failed to start tracer %d\n", err);

		goto err_notifier_unregister;

	}

	return 0;



err_notifier_unregister:

	mlx5_eq_notifier_unregister(dev, &tracer->nb);

	mlx5_core_destroy_mkey(dev, &tracer->buff.mkey);

err_dealloc_pd:

	mlx5_core_dealloc_pd(dev, tracer->buff.pdn);

	cancel_work_sync(&tracer->read_fw_strings_work);

	return err;

}

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

+5 −0
Original line number Diff line number Diff line
@@ -124,6 +124,11 @@ static int mlx5e_route_lookup_ipv4_get(struct mlx5e_priv *priv, 
	if (IS_ERR(rt))

		return PTR_ERR(rt);



	if (rt->rt_type != RTN_UNICAST) {

		ret = -ENETUNREACH;

		goto err_rt_release;

	}



	if (mlx5_lag_is_multipath(mdev) && rt->rt_gw_family != AF_INET) {

		ret = -ENETUNREACH;

		goto err_rt_release;