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

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



Saeed Mahameed says:

====================
mlx5 fixes 2021-04-14

This series provides 3 small 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 4e39a072 e3e0f9b2

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

+5 −0
Original line number Diff line number Diff line
@@ -246,6 +246,11 @@ static int mlx5_devlink_trap_action_set(struct devlink *devlink, 
	struct mlx5_devlink_trap *dl_trap;

	int err = 0;



	if (is_mdev_switchdev_mode(dev)) {

		NL_SET_ERR_MSG_MOD(extack, "Devlink traps can't be set in switchdev mode");

		return -EOPNOTSUPP;

	}



	dl_trap = mlx5_find_trap_by_id(dev, trap->id);

	if (!dl_trap) {

		mlx5_core_err(dev, "Devlink trap: Set action on invalid trap id 0x%x", trap->id);

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

+4 −19
Original line number Diff line number Diff line
@@ -387,21 +387,6 @@ enum mlx5e_fec_supported_link_mode { 
			*_policy = MLX5_GET(pplm_reg, _buf, fec_override_admin_##link);	\

	} while (0)



#define MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(buf, policy, write, link)			\

	do {										\

		unsigned long policy_long;						\

		u16 *__policy = &(policy);						\

		bool _write = (write);							\

											\

		policy_long = *__policy;						\

		if (_write && *__policy)						\

			*__policy = find_first_bit(&policy_long,			\

						   sizeof(policy_long) * BITS_PER_BYTE);\

		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(buf, *__policy, _write, link);		\

		if (!_write && *__policy)						\

			*__policy = 1 << *__policy;					\

	} while (0)



/* get/set FEC admin field for a given speed */

static int mlx5e_fec_admin_field(u32 *pplm, u16 *fec_policy, bool write,

				 enum mlx5e_fec_supported_link_mode link_mode)
@@ -423,16 +408,16 @@ static int mlx5e_fec_admin_field(u32 *pplm, u16 *fec_policy, bool write, 
		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 100g);

		break;

	case MLX5E_FEC_SUPPORTED_LINK_MODE_50G_1X:

		MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(pplm, *fec_policy, write, 50g_1x);

		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 50g_1x);

		break;

	case MLX5E_FEC_SUPPORTED_LINK_MODE_100G_2X:

		MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(pplm, *fec_policy, write, 100g_2x);

		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 100g_2x);

		break;

	case MLX5E_FEC_SUPPORTED_LINK_MODE_200G_4X:

		MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(pplm, *fec_policy, write, 200g_4x);

		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 200g_4x);

		break;

	case MLX5E_FEC_SUPPORTED_LINK_MODE_400G_8X:

		MLX5E_FEC_OVERRIDE_ADMIN_50G_POLICY(pplm, *fec_policy, write, 400g_8x);

		MLX5E_FEC_OVERRIDE_ADMIN_POLICY(pplm, *fec_policy, write, 400g_8x);

		break;

	default:

		return -EINVAL;

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

+3 −0
Original line number Diff line number Diff line
@@ -1895,6 +1895,9 @@ static int mlx5e_flower_parse_meta(struct net_device *filter_dev, 
		return 0;



	flow_rule_match_meta(rule, &match);

	if (!match.mask->ingress_ifindex)

		return 0;



	if (match.mask->ingress_ifindex != 0xFFFFFFFF) {

		NL_SET_ERR_MSG_MOD(extack, "Unsupported ingress ifindex mask");

		return -EOPNOTSUPP;