Commit c4ad5f2b authored Nov 09, 2022 by Shay Drory Committed by Saeed Mahameed Dec 28, 2022

net/mlx5: Fix RoCE setting at HCA level



mlx5 PF can disable RoCE for its VFs and SFs. In such case RoCE is
marked as unsupported on those VFs/SFs.
The cited patch added an option for disable (and enable) RoCE at HCA
level. However, that commit didn't check whether RoCE is supported on
the HCA and enabled user to try and set RoCE to on.
Fix it by checking whether the HCA supports RoCE.

Fixes: fbfa97b4 ("net/mlx5: Disable roce at HCA level")
Signed-off-by: Shay Drory <shayd@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

parent 9078e843

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -468,7 +468,7 @@ static int mlx5_devlink_enable_roce_validate(struct devlink *devlink, u32 id,
		bool new_state = val.vbool;

		if (new_state && !MLX5_CAP_GEN(dev, roce) &&
		!MLX5_CAP_GEN(dev, roce_rw_supported)) {
		!(MLX5_CAP_GEN(dev, roce_rw_supported) && MLX5_CAP_GEN_MAX(dev, roce))) {
		NL_SET_ERR_MSG_MOD(extack, "Device doesn't support RoCE");
		return -EOPNOTSUPP;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -613,7 +613,7 @@ static int handle_hca_cap(struct mlx5_core_dev dev, void set_ctx)
		MLX5_SET(cmd_hca_cap, set_hca_cap, num_total_dynamic_vf_msix,
		MLX5_CAP_GEN_MAX(dev, num_total_dynamic_vf_msix));

		if (MLX5_CAP_GEN(dev, roce_rw_supported))
		if (MLX5_CAP_GEN(dev, roce_rw_supported) && MLX5_CAP_GEN_MAX(dev, roce))
		MLX5_SET(cmd_hca_cap, set_hca_cap, roce,
		mlx5_is_roce_on(dev));