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

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



Saeed Mahameed says:

====================
mlx5 updates 2021-08-11

This series provides misc updates to mlx5.
For more information please see tag log below.

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

mlx5-updates-2021-08-11

Misc. cleanup for mlx5.

1) Typos and use of netdev_warn()
2) smatch cleanup
3) Minor fix to inner TTC table creation
4) Dynamic capability cache allocation
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dea80774 61b6a6c3

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

+4 −4
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static void cb_timeout_handler(struct work_struct *work) 
	ent->ret = -ETIMEDOUT;

	mlx5_core_warn(dev, "cmd[%d]: %s(0x%x) Async, timeout. Will cause a leak of a command resource\n",

		       ent->idx, mlx5_command_str(msg_to_opcode(ent->in)), msg_to_opcode(ent->in));

	mlx5_cmd_comp_handler(dev, 1UL << ent->idx, true);

	mlx5_cmd_comp_handler(dev, 1ULL << ent->idx, true);



out:

	cmd_ent_put(ent); /* for the cmd_ent_get() took on schedule delayed work */
@@ -994,7 +994,7 @@ static void cmd_work_handler(struct work_struct *work) 
		MLX5_SET(mbox_out, ent->out, status, status);

		MLX5_SET(mbox_out, ent->out, syndrome, drv_synd);



		mlx5_cmd_comp_handler(dev, 1UL << ent->idx, true);

		mlx5_cmd_comp_handler(dev, 1ULL << ent->idx, true);

		return;

	}
@@ -1008,7 +1008,7 @@ static void cmd_work_handler(struct work_struct *work) 
		poll_timeout(ent);

		/* make sure we read the descriptor after ownership is SW */

		rmb();

		mlx5_cmd_comp_handler(dev, 1UL << ent->idx, (ent->ret == -ETIMEDOUT));

		mlx5_cmd_comp_handler(dev, 1ULL << ent->idx, (ent->ret == -ETIMEDOUT));

	}

}
@@ -1068,7 +1068,7 @@ static void wait_func_handle_exec_timeout(struct mlx5_core_dev *dev, 
		       mlx5_command_str(msg_to_opcode(ent->in)), msg_to_opcode(ent->in));



	ent->ret = -ETIMEDOUT;

	mlx5_cmd_comp_handler(dev, 1UL << ent->idx, true);

	mlx5_cmd_comp_handler(dev, 1ULL << ent->idx, true);

}



static int wait_func(struct mlx5_core_dev *dev, struct mlx5_cmd_work_ent *ent)

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

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, 
	e->out_dev = attr.out_dev;

	e->route_dev_ifindex = attr.route_dev->ifindex;



	/* It's importent to add the neigh to the hash table before checking

	/* It's important to add the neigh to the hash table before checking

	 * the neigh validity state. So if we'll get a notification, in case the

	 * neigh changes it's validity state, we would find the relevant neigh

	 * in the hash.

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ int mlx5e_open_xsk(struct mlx5e_priv *priv, struct mlx5e_params *params, 
	/* Create a separate SQ, so that when the buff pool is disabled, we could

	 * close this SQ safely and stop receiving CQEs. In other case, e.g., if

	 * the XDPSQ was used instead, we might run into trouble when the buff pool

	 * is disabled and then reenabled, but the SQ continues receiving CQEs

	 * is disabled and then re-enabled, but the SQ continues receiving CQEs

	 * from the old buff pool.

	 */

	err = mlx5e_open_xdpsq(c, params, &cparam->xdp_sq, pool, &c->xsksq, true);

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "en.h"



/* mlx5e global resources should be placed in this file.

 * Global resources are common to all the netdevices crated on the same nic.

 * Global resources are common to all the netdevices created on the same nic.

 */



void mlx5e_mkey_set_relaxed_ordering(struct mlx5_core_dev *mdev, void *mkc)

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

+2 −1
Original line number Diff line number Diff line
@@ -1255,7 +1255,8 @@ static int mlx5e_create_inner_ttc_table(struct mlx5e_priv *priv) 
		return 0;



	mlx5e_set_inner_ttc_params(priv, &ttc_params);

	priv->fs.inner_ttc = mlx5_create_ttc_table(priv->mdev, &ttc_params);

	priv->fs.inner_ttc = mlx5_create_inner_ttc_table(priv->mdev,

							 &ttc_params);

	if (IS_ERR(priv->fs.inner_ttc))

		return PTR_ERR(priv->fs.inner_ttc);

	return 0;