Commit 94de879c authored by Michael Guralnik's avatar Michael Guralnik Committed by Saeed Mahameed
Browse files

IB/mlx5: Load profile according to RoCE enablement state 



When RoCE is disabled load mlx5_ib in raw_eth profile.
Clean pf_profile roce capability checks as it will not be used without
roce capability.

Signed-off-by: default avatarMichael Guralnik <michaelgur@mellanox.com>
Reviewed-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent b5a498ba

drivers/infiniband/hw/mlx5/main.c

+13 −12
Original line number Diff line number Diff line
@@ -5145,7 +5145,6 @@ static int mlx5_port_immutable(struct ib_device *ibdev, u8 port_num, 
	immutable->pkey_tbl_len = attr.pkey_tbl_len;

	immutable->gid_tbl_len = attr.gid_tbl_len;

	immutable->core_cap_flags = get_core_cap_flags(ibdev, &rep);

	if ((ll == IB_LINK_LAYER_INFINIBAND) || MLX5_CAP_GEN(dev->mdev, roce))

	immutable->max_mad_size = IB_MGMT_MAD_SIZE;



	return 0;
@@ -5249,11 +5248,9 @@ static int mlx5_enable_eth(struct mlx5_ib_dev *dev) 
{

	int err;



	if (MLX5_CAP_GEN(dev->mdev, roce)) {

	err = mlx5_nic_vport_enable_roce(dev->mdev);

	if (err)

		return err;

	}



	err = mlx5_eth_lag_init(dev);

	if (err)
@@ -5262,7 +5259,6 @@ static int mlx5_enable_eth(struct mlx5_ib_dev *dev) 
	return 0;



err_disable_roce:

	if (MLX5_CAP_GEN(dev->mdev, roce))

	mlx5_nic_vport_disable_roce(dev->mdev);



	return err;
@@ -5271,7 +5267,6 @@ err_disable_roce: 
static void mlx5_disable_eth(struct mlx5_ib_dev *dev)

{

	mlx5_eth_lag_cleanup(dev);

	if (MLX5_CAP_GEN(dev->mdev, roce))

	mlx5_nic_vport_disable_roce(dev->mdev);

}
@@ -6898,6 +6893,7 @@ static void *mlx5_ib_add_slave_port(struct mlx5_core_dev *mdev) 


static void *mlx5_ib_add(struct mlx5_core_dev *mdev)

{

	const struct mlx5_ib_profile *profile;

	enum rdma_link_layer ll;

	struct mlx5_ib_dev *dev;

	int port_type_cap;
@@ -6933,7 +6929,12 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	dev->mdev = mdev;

	dev->num_ports = num_ports;



	return __mlx5_ib_add(dev, &pf_profile);

	if (ll == IB_LINK_LAYER_ETHERNET && !mlx5_is_roce_enabled(mdev))

		profile = &raw_eth_profile;

	else

		profile = &pf_profile;



	return __mlx5_ib_add(dev, profile);

}



static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context)

CRA Git | Maintained and supported by SUSTech CRA and CCSE