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

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

Saeed Mahameed says:

====================
mlx5 fixes 2021-09-07

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

Included here, a patch which solves a build warning reported on
linux-kernel mailing list [1]:
Fix commit ("net/mlx5: Bridge, fix uninitialized variable usage")

I hope this series can make it to rc1.

[1] https://www.spinics.net/lists/netdev/msg765481.html


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d437f5aa 8db6a54f

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

+2 −5
Original line number Diff line number Diff line
@@ -658,11 +658,10 @@ static const struct devlink_param enable_rdma_param = 


static int mlx5_devlink_rdma_param_register(struct devlink *devlink)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	union devlink_param_value value;

	int err;



	if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND) || MLX5_ESWITCH_MANAGER(dev))

	if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))

		return 0;



	err = devlink_param_register(devlink, &enable_rdma_param);
@@ -679,9 +678,7 @@ static int mlx5_devlink_rdma_param_register(struct devlink *devlink) 


static void mlx5_devlink_rdma_param_unregister(struct devlink *devlink)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);



	if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND) || MLX5_ESWITCH_MANAGER(dev))

	if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))

		return;



	devlink_param_unpublish(devlink, &enable_rdma_param);

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

+2 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer) 
	err = mlx5_core_alloc_pd(dev, &tracer->buff.pdn);

	if (err) {

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

		return err;

		goto err_cancel_work;

	}



	err = mlx5_fw_tracer_create_mkey(tracer);
@@ -1031,6 +1031,7 @@ int mlx5_fw_tracer_init(struct mlx5_fw_tracer *tracer) 
	mlx5_core_destroy_mkey(dev, &tracer->buff.mkey);

err_dealloc_pd:

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

err_cancel_work:

	cancel_work_sync(&tracer->read_fw_strings_work);

	return err;

}

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ void mlx5e_set_rx_mode_work(struct work_struct *work); 


int mlx5e_hwstamp_set(struct mlx5e_priv *priv, struct ifreq *ifr);

int mlx5e_hwstamp_get(struct mlx5e_priv *priv, struct ifreq *ifr);

int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool val);

int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool val, bool rx_filter);



int mlx5e_vlan_rx_add_vid(struct net_device *dev, __always_unused __be16 proto,

			  u16 vid);

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

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int mlx5_esw_bridge_port_changeupper(struct notifier_block *nb, void *ptr 
	u16 vport_num, esw_owner_vhca_id;

	struct netlink_ext_ack *extack;

	int ifindex = upper->ifindex;

	int err;

	int err = 0;



	if (!netif_is_bridge_master(upper))

		return 0;
@@ -244,7 +244,7 @@ mlx5_esw_bridge_port_obj_attr_set(struct net_device *dev, 
	struct netlink_ext_ack *extack = switchdev_notifier_info_to_extack(&port_attr_info->info);

	const struct switchdev_attr *attr = port_attr_info->attr;

	u16 vport_num, esw_owner_vhca_id;

	int err;

	int err = 0;



	if (!mlx5_esw_bridge_lower_rep_vport_num_vhca_id_get(dev, br_offloads->esw, &vport_num,

							     &esw_owner_vhca_id))

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

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_chann 
	if (res->features & MLX5E_RX_RES_FEATURE_PTP) {

		u32 rqn;



		if (mlx5e_channels_get_ptp_rqn(chs, &rqn))

		if (!mlx5e_channels_get_ptp_rqn(chs, &rqn))

			rqn = res->drop_rqn;



		err = mlx5e_rqt_redirect_direct(&res->ptp.rqt, rqn);