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

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



Saeed Mahameed says:

====================
mlx5 fixes 2021-05-18

This series introduces some 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 c71b9964 e63052a5

drivers/infiniband/hw/mlx5/mr.c

+2 −2
Original line number Diff line number Diff line
@@ -743,10 +743,10 @@ int mlx5_mr_cache_init(struct mlx5_ib_dev *dev) 
		ent->xlt = (1 << ent->order) * sizeof(struct mlx5_mtt) /

			   MLX5_IB_UMR_OCTOWORD;

		ent->access_mode = MLX5_MKC_ACCESS_MODE_MTT;

		if ((dev->mdev->profile->mask & MLX5_PROF_MASK_MR_CACHE) &&

		if ((dev->mdev->profile.mask & MLX5_PROF_MASK_MR_CACHE) &&

		    !dev->is_rep && mlx5_core_is_pf(dev->mdev) &&

		    mlx5_ib_can_load_pas_with_umr(dev, 0))

			ent->limit = dev->mdev->profile->mr_cache[i].limit;

			ent->limit = dev->mdev->profile.mr_cache[i].limit;

		else

			ent->limit = 0;

		spin_lock_irq(&ent->lock);

drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,8 @@ static void mlx5e_rep_changelowerstate_event(struct net_device *netdev, void *pt 
	rpriv = priv->ppriv;

	fwd_vport_num = rpriv->rep->vport;

	lag_dev = netdev_master_upper_dev_get(netdev);

	if (!lag_dev)

		return;



	netdev_dbg(netdev, "lag_dev(%s)'s slave vport(%d) is txable(%d)\n",

		   lag_dev->name, fwd_vport_num, net_lag_port_dev_txable(netdev));

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

+1 −1
Original line number Diff line number Diff line
@@ -1505,7 +1505,7 @@ mlx5e_init_fib_work_ipv4(struct mlx5e_priv *priv, 


	fen_info = container_of(info, struct fib_entry_notifier_info, info);

	fib_dev = fib_info_nh(fen_info->fi, 0)->fib_nh_dev;

	if (fib_dev->netdev_ops != &mlx5e_netdev_ops ||

	if (!fib_dev || fib_dev->netdev_ops != &mlx5e_netdev_ops ||

	    fen_info->dst_len != 32)

		return NULL;

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

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/ipv6.h>

#include <linux/tcp.h>

#include <linux/mlx5/fs.h>

#include <linux/mlx5/mpfs.h>

#include "en.h"

#include "en_rep.h"

#include "lib/mpfs.h"

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

+13 −3
Original line number Diff line number Diff line
@@ -889,10 +889,13 @@ int mlx5e_open_rq(struct mlx5e_params *params, struct mlx5e_rq_param *param, 
void mlx5e_activate_rq(struct mlx5e_rq *rq)

{

	set_bit(MLX5E_RQ_STATE_ENABLED, &rq->state);

	if (rq->icosq)

	if (rq->icosq) {

		mlx5e_trigger_irq(rq->icosq);

	else

	} else {

		local_bh_disable();

		napi_schedule(rq->cq.napi);

		local_bh_enable();

	}

}



void mlx5e_deactivate_rq(struct mlx5e_rq *rq)
@@ -2697,7 +2700,7 @@ static int mlx5e_update_netdev_queues(struct mlx5e_priv *priv) 
	int err;



	old_num_txqs = netdev->real_num_tx_queues;

	old_ntc = netdev->num_tc;

	old_ntc = netdev->num_tc ? : 1;



	nch = priv->channels.params.num_channels;

	ntc = priv->channels.params.num_tc;
@@ -5229,6 +5232,11 @@ static void mlx5e_update_features(struct net_device *netdev) 
	rtnl_unlock();

}



static void mlx5e_reset_channels(struct net_device *netdev)

{

	netdev_reset_tc(netdev);

}



int mlx5e_attach_netdev(struct mlx5e_priv *priv)

{

	const bool take_rtnl = priv->netdev->reg_state == NETREG_REGISTERED;
@@ -5283,6 +5291,7 @@ int mlx5e_attach_netdev(struct mlx5e_priv *priv) 
	profile->cleanup_tx(priv);



out:

	mlx5e_reset_channels(priv->netdev);

	set_bit(MLX5E_STATE_DESTROYING, &priv->state);

	cancel_work_sync(&priv->update_stats_work);

	return err;
@@ -5300,6 +5309,7 @@ void mlx5e_detach_netdev(struct mlx5e_priv *priv) 


	profile->cleanup_rx(priv);

	profile->cleanup_tx(priv);

	mlx5e_reset_channels(priv->netdev);

	cancel_work_sync(&priv->update_stats_work);

}