|
 |
d8f823 |
From 923f2933d2da0e93d9a92633806fd953b19992d3 Mon Sep 17 00:00:00 2001
|
|
|
d8f823 |
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
|
d8f823 |
Date: Tue, 12 May 2020 10:54:32 -0400
|
|
|
d8f823 |
Subject: [PATCH 162/312] [netdrv] net/mlx5_core: Set IB capability mask1 to
|
|
|
d8f823 |
fix ib_srpt connection failure
|
|
|
d8f823 |
|
|
|
d8f823 |
Message-id: <20200512105530.4207-67-ahleihel@redhat.com>
|
|
|
d8f823 |
Patchwork-id: 306938
|
|
|
d8f823 |
Patchwork-instance: patchwork
|
|
|
d8f823 |
O-Subject: [RHEL8.3 BZ 1789382 066/124] net/mlx5_core: Set IB capability mask1 to fix ib_srpt connection failure
|
|
|
d8f823 |
Bugzilla: 1789382
|
|
|
d8f823 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
d8f823 |
|
|
|
d8f823 |
Bugzilla: http://bugzilla.redhat.com/1789382
|
|
|
d8f823 |
Upstream: v5.6
|
|
|
d8f823 |
|
|
|
d8f823 |
commit 306f354c67397b3138300cde875c5cab45b857f7
|
|
|
d8f823 |
Author: Leon Romanovsky <leonro@mellanox.com>
|
|
|
d8f823 |
Date: Mon Mar 16 09:31:03 2020 +0200
|
|
|
d8f823 |
|
|
|
d8f823 |
net/mlx5_core: Set IB capability mask1 to fix ib_srpt connection failure
|
|
|
d8f823 |
|
|
|
d8f823 |
The cap_mask1 isn't protected by field_select and not listed among RW
|
|
|
d8f823 |
fields, but it is required to be written to properly initialize ports
|
|
|
d8f823 |
in IB virtualization mode.
|
|
|
d8f823 |
|
|
|
d8f823 |
Link: https://lore.kernel.org/linux-rdma/88bab94d2fd72f3145835b4518bc63dda587add6.camel@redhat.com
|
|
|
d8f823 |
Fixes: ab118da4c10a ("net/mlx5: Don't write read-only fields in MODIFY_HCA_VPORT_CONTEXT command")
|
|
|
d8f823 |
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
|
|
|
d8f823 |
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
d8f823 |
|
|
|
d8f823 |
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
|
d8f823 |
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
|
d8f823 |
---
|
|
|
d8f823 |
drivers/net/ethernet/mellanox/mlx5/core/vport.c | 3 +++
|
|
|
d8f823 |
1 file changed, 3 insertions(+)
|
|
|
d8f823 |
|
|
|
d8f823 |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
|
|
|
d8f823 |
index 1faac31f74d0..23f879da9104 100644
|
|
|
d8f823 |
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
|
|
|
d8f823 |
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
|
|
|
d8f823 |
@@ -1071,6 +1071,9 @@ int mlx5_core_modify_hca_vport_context(struct mlx5_core_dev *dev,
|
|
|
d8f823 |
MLX5_SET64(hca_vport_context, ctx, port_guid, req->port_guid);
|
|
|
d8f823 |
if (req->field_select & MLX5_HCA_VPORT_SEL_NODE_GUID)
|
|
|
d8f823 |
MLX5_SET64(hca_vport_context, ctx, node_guid, req->node_guid);
|
|
|
d8f823 |
+ MLX5_SET(hca_vport_context, ctx, cap_mask1, req->cap_mask1);
|
|
|
d8f823 |
+ MLX5_SET(hca_vport_context, ctx, cap_mask1_field_select,
|
|
|
d8f823 |
+ req->cap_mask1_perm);
|
|
|
d8f823 |
err = mlx5_cmd_exec(dev, in, in_sz, out, sizeof(out));
|
|
|
d8f823 |
ex:
|
|
|
d8f823 |
kfree(in);
|
|
|
d8f823 |
--
|
|
|
d8f823 |
2.13.6
|
|
|
d8f823 |
|