Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6f7d2af authored by Ilan Tayari's avatar Ilan Tayari Committed by Saeed Mahameed
Browse files

net/mlx5: Add support for multiple RoCE enable 



Previously, only mlx5_ib enabled RoCE on the port, but FPGA needs it as
well.
Add support for counting number of enables, so that FPGA and IB can work
in parallel and independently.
Program the HW to enable RoCE on the first enable call, and program to
disable RoCE on the last disable call.

Signed-off-by: default avatarIlan Tayari <ilant@mellanox.com>
Reviewed-by: default avatarBoris Pismenny <borisp@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 52ec462e

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

+4 −0
Original line number Diff line number Diff line
@@ -926,12 +926,16 @@ static int mlx5_nic_vport_update_roce_state(struct mlx5_core_dev *mdev, 


int mlx5_nic_vport_enable_roce(struct mlx5_core_dev *mdev)

{

	if (atomic_inc_return(&mdev->roce.roce_en) != 1)

		return 0;

	return mlx5_nic_vport_update_roce_state(mdev, MLX5_VPORT_ROCE_ENABLED);

}

EXPORT_SYMBOL_GPL(mlx5_nic_vport_enable_roce);



int mlx5_nic_vport_disable_roce(struct mlx5_core_dev *mdev)

{

	if (atomic_dec_return(&mdev->roce.roce_en) != 0)

		return 0;

	return mlx5_nic_vport_update_roce_state(mdev, MLX5_VPORT_ROCE_DISABLED);

}

EXPORT_SYMBOL_GPL(mlx5_nic_vport_disable_roce);

include/linux/mlx5/driver.h

+1 −0
Original line number Diff line number Diff line
@@ -777,6 +777,7 @@ struct mlx5_core_dev { 
	struct mlx5e_resources  mlx5e_res;

	struct {

		struct mlx5_rsvd_gids	reserved_gids;

		atomic_t                roce_en;

	} roce;

#ifdef CONFIG_MLX5_FPGA

	struct mlx5_fpga_device *fpga;