Commit 65a20c2e authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

net/mlx5: Remove MLX5E_LOCKED_FLOW flag 



The MLX5E_LOCKED_FLOW flag is not checked anywhere now so remove it
entirely.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ee75f1fc

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

+2 −12
Original line number Diff line number Diff line
@@ -349,7 +349,6 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) 
	devl_assert_locked(priv_to_devlink(dev));

	mutex_lock(&mlx5_intf_mutex);

	priv->flags &= ~MLX5_PRIV_FLAGS_DETACH;

	priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

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

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

			bool is_supported = false;
@@ -397,7 +396,6 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) 
			break;

		}

	}

	priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	mutex_unlock(&mlx5_intf_mutex);

	return ret;

}
@@ -412,7 +410,6 @@ void mlx5_detach_device(struct mlx5_core_dev *dev) 


	devl_assert_locked(priv_to_devlink(dev));

	mutex_lock(&mlx5_intf_mutex);

	priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	for (i = ARRAY_SIZE(mlx5_adev_devices) - 1; i >= 0; i--) {

		if (!priv->adev[i])

			continue;
@@ -441,7 +438,6 @@ void mlx5_detach_device(struct mlx5_core_dev *dev) 
		del_adev(&priv->adev[i]->adev);

		priv->adev[i] = NULL;

	}

	priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	priv->flags |= MLX5_PRIV_FLAGS_DETACH;

	mutex_unlock(&mlx5_intf_mutex);

}
@@ -540,22 +536,16 @@ static void delete_drivers(struct mlx5_core_dev *dev) 
int mlx5_rescan_drivers_locked(struct mlx5_core_dev *dev)

{

	struct mlx5_priv *priv = &dev->priv;

	int err = 0;



	lockdep_assert_held(&mlx5_intf_mutex);

	if (priv->flags & MLX5_PRIV_FLAGS_DETACH)

		return 0;



	priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	delete_drivers(dev);

	if (priv->flags & MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV)

		goto out;



	err = add_drivers(dev);

		return 0;



out:

	priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;

	return err;

	return add_drivers(dev);

}



bool mlx5_same_hw_devs(struct mlx5_core_dev *dev, struct mlx5_core_dev *peer_dev)

include/linux/mlx5/driver.h

+0 −4
Original line number Diff line number Diff line
@@ -554,10 +554,6 @@ enum { 
	 * creation/deletion on drivers rescan. Unset during device attach.

	 */

	MLX5_PRIV_FLAGS_DETACH = 1 << 2,

	/* Distinguish between mlx5e_probe/remove called by module init/cleanup

	 * and called by other flows which can already hold devlink lock

	 */

	MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW = 1 << 3,

};



struct mlx5_adev {