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

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



Saeed Mahameed says:

====================
mlx5 fixes 2021-06-16

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 7edcc682 0232fc2d

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

+19 −0
Original line number Diff line number Diff line
@@ -303,6 +303,7 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) 
	int ret = 0, i;



	mutex_lock(&mlx5_intf_mutex);

	priv->flags &= ~MLX5_PRIV_FLAGS_DETACH;

	for (i = 0; i < ARRAY_SIZE(mlx5_adev_devices); i++) {

		if (!priv->adev[i]) {

			bool is_supported = false;
@@ -320,6 +321,16 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) 
			}

		} else {

			adev = &priv->adev[i]->adev;



			/* Pay attention that this is not PCI driver that

			 * mlx5_core_dev is connected, but auxiliary driver.

			 *

			 * Here we can race of module unload with devlink

			 * reload, but we don't need to take extra lock because

			 * we are holding global mlx5_intf_mutex.

			 */

			if (!adev->dev.driver)

				continue;

			adrv = to_auxiliary_drv(adev->dev.driver);



			if (adrv->resume)
@@ -350,6 +361,10 @@ void mlx5_detach_device(struct mlx5_core_dev *dev) 
			continue;



		adev = &priv->adev[i]->adev;

		/* Auxiliary driver was unbind manually through sysfs */

		if (!adev->dev.driver)

			goto skip_suspend;



		adrv = to_auxiliary_drv(adev->dev.driver);



		if (adrv->suspend) {
@@ -357,9 +372,11 @@ void mlx5_detach_device(struct mlx5_core_dev *dev) 
			continue;

		}



skip_suspend:

		del_adev(&priv->adev[i]->adev);

		priv->adev[i] = NULL;

	}

	priv->flags |= MLX5_PRIV_FLAGS_DETACH;

	mutex_unlock(&mlx5_intf_mutex);

}
@@ -448,6 +465,8 @@ int mlx5_rescan_drivers_locked(struct mlx5_core_dev *dev) 
	struct mlx5_priv *priv = &dev->priv;



	lockdep_assert_held(&mlx5_intf_mutex);

	if (priv->flags & MLX5_PRIV_FLAGS_DETACH)

		return 0;



	delete_drivers(dev);

	if (priv->flags & MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV)

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

+6 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,12 @@ int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, u16 vport_num, 
			goto err_vhca_mapping;

	}



	/* External controller host PF has factory programmed MAC.

	 * Read it from the device.

	 */

	if (mlx5_core_is_ecpf(esw->dev) && vport_num == MLX5_VPORT_PF)

		mlx5_query_nic_vport_mac_address(esw->dev, vport_num, true, vport->info.mac);



	esw_vport_change_handle_locked(vport);



	esw->enabled_vports++;

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

+2 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ static int mlx5_load(struct mlx5_core_dev *dev) 
	err = mlx5_core_set_hca_defaults(dev);

	if (err) {

		mlx5_core_err(dev, "Failed to set hca defaults\n");

		goto err_sriov;

		goto err_set_hca;

	}



	mlx5_vhca_event_start(dev);
@@ -1194,6 +1194,7 @@ static int mlx5_load(struct mlx5_core_dev *dev) 
	mlx5_sf_hw_table_destroy(dev);

err_vhca:

	mlx5_vhca_event_stop(dev);

err_set_hca:

	mlx5_cleanup_fs(dev);

err_fs:

	mlx5_accel_tls_cleanup(dev);

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

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int mlx5_core_create_mkey(struct mlx5_core_dev *dev, 
	mkey_index = MLX5_GET(create_mkey_out, lout, mkey_index);

	mkey->iova = MLX5_GET64(mkc, mkc, start_addr);

	mkey->size = MLX5_GET64(mkc, mkc, len);

	mkey->key |= mlx5_idx_to_mkey(mkey_index);

	mkey->key = (u32)mlx5_mkey_variant(mkey->key) | mlx5_idx_to_mkey(mkey_index);

	mkey->pd = MLX5_GET(mkc, mkc, pd);

	init_waitqueue_head(&mkey->wait);

drivers/net/ethernet/mellanox/mlx5/core/sf/dev/dev.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ mlx5_sf_dev_state_change_handler(struct notifier_block *nb, unsigned long event_ 
	sf_index = event->function_id - base_id;

	sf_dev = xa_load(&table->devices, sf_index);

	switch (event->new_vhca_state) {

	case MLX5_VHCA_STATE_INVALID:

	case MLX5_VHCA_STATE_ALLOCATED:

		if (sf_dev)

			mlx5_sf_dev_del(table->dev, sf_dev, sf_index);