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

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



Saeed Mahameed says:

====================
mlx5 fixes 2021-04-06

This series provides 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 a79ace4b d5f9b005

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

+3 −2
Original line number Diff line number Diff line
@@ -1107,6 +1107,7 @@ static void mlx5e_uplink_rep_enable(struct mlx5e_priv *priv) 


	mlx5e_rep_tc_enable(priv);



	if (MLX5_CAP_GEN(mdev, uplink_follow))

		mlx5_modify_vport_admin_state(mdev, MLX5_VPORT_STATE_OP_MOD_UPLINK,

					      0, 0, MLX5_VPORT_ADMIN_STATE_AUTO);

	mlx5_lag_add(mdev, netdev);

drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c

+5 −5
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static int mlx5_esw_indir_table_rule_get(struct mlx5_eswitch *esw, 
err_ethertype:

	kfree(rule);

out:

	kfree(rule_spec);

	kvfree(rule_spec);

	return err;

}
@@ -328,7 +328,7 @@ static int mlx5_create_indir_recirc_group(struct mlx5_eswitch *esw, 
	e->recirc_cnt = 0;



out:

	kfree(in);

	kvfree(in);

	return err;

}
@@ -347,7 +347,7 @@ static int mlx5_create_indir_fwd_group(struct mlx5_eswitch *esw, 


	spec = kvzalloc(sizeof(*spec), GFP_KERNEL);

	if (!spec) {

		kfree(in);

		kvfree(in);

		return -ENOMEM;

	}
@@ -371,8 +371,8 @@ static int mlx5_create_indir_fwd_group(struct mlx5_eswitch *esw, 
	}



err_out:

	kfree(spec);

	kfree(in);

	kvfree(spec);

	kvfree(in);

	return err;

}

include/linux/mlx5/mlx5_ifc.h

+6 −4
Original line number Diff line number Diff line
@@ -437,11 +437,11 @@ struct mlx5_ifc_flow_table_prop_layout_bits { 
	u8         reserved_at_60[0x18];

	u8         log_max_ft_num[0x8];



	u8         reserved_at_80[0x18];

	u8         reserved_at_80[0x10];

	u8         log_max_flow_counter[0x8];

	u8         log_max_destination[0x8];



	u8         log_max_flow_counter[0x8];

	u8         reserved_at_a8[0x10];

	u8         reserved_at_a0[0x18];

	u8         log_max_flow[0x8];



	u8         reserved_at_c0[0x40];
@@ -8835,6 +8835,8 @@ struct mlx5_ifc_pplm_reg_bits { 


	u8         fec_override_admin_100g_2x[0x10];

	u8         fec_override_admin_50g_1x[0x10];



	u8         reserved_at_140[0x140];

};



struct mlx5_ifc_ppcnt_reg_bits {
@@ -10198,7 +10200,7 @@ struct mlx5_ifc_pbmc_reg_bits { 


	struct mlx5_ifc_bufferx_reg_bits buffer[10];



	u8         reserved_at_2e0[0x40];

	u8         reserved_at_2e0[0x80];

};



struct mlx5_ifc_qtct_reg_bits {