summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/mellanox
diff options
context:
space:
mode:
authorMaor Gottlieb <maorg@nvidia.com>2021-06-06 11:20:46 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-23 14:42:43 +0200
commit792f16e083b5fdf6bd82c76a73d59d9f23c86a40 (patch)
tree0115c3a6fa0bbc8c49b93e2d513b2739fa829cb1 /drivers/net/ethernet/mellanox
parentbe7f3f401d224e1efe8112b2fa8b837eeb8c5e52 (diff)
downloadlinux-rt-792f16e083b5fdf6bd82c76a73d59d9f23c86a40.tar.gz
net/mlx5: Consider RoCE cap before init RDMA resources
[ Upstream commit c189716b2a7c1d2d8658e269735273caa1c38b54 ] Check if RoCE is supported by the device before enable it in the vport context and create all the RDMA steering objects. Fixes: 80f09dfc237f ("net/mlx5: Eswitch, enable RoCE loopback traffic") Signed-off-by: Maor Gottlieb <maorg@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/rdma.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c b/drivers/net/ethernet/mellanox/mlx5/core/rdma.c
index 8e0dddc6383f..2389239acadc 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/rdma.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/rdma.c
@@ -156,6 +156,9 @@ void mlx5_rdma_enable_roce(struct mlx5_core_dev *dev)
{
int err;
+ if (!MLX5_CAP_GEN(dev, roce))
+ return;
+
err = mlx5_nic_vport_enable_roce(dev);
if (err) {
mlx5_core_err(dev, "Failed to enable RoCE: %d\n", err);