Skip to contentSkip to conversation

net/mlx5: Separate ODP capabilities

PATCH Applied Leon Romanovsky 2 participants 3 messages Feb 19, 2019 – Feb 21, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: Separate ODP capabilities

From: Moni Shoua <[email protected]>

ODP support for XRC transport is not enabled by default in FW, so we need separate ODP checks to enable/disable it.

While that, rewrite the set of ODP SRQ support capabilities in way that tests each field separately for clearness, which is not needed for current FW, but better to have it separated.

---
 .../net/ethernet/mellanox/mlx5/core/main.c    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +15 -14
index 025dfaf3466b..5cf557a77f0f 100644
@@ -474,11 +474,6 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev)
 	if (err)
 		return err;
 
-	if (!(MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive) ||
-	      MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive) ||
-	      MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive)))
-		return 0;
-
 	set_sz = MLX5_ST_SZ_BYTES(set_hca_cap_in);
 	set_ctx = kzalloc(set_sz, GFP_KERNEL);
 	if (!set_ctx)
@@ -488,15 +483,21 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev)
 	memcpy(set_hca_cap, dev->caps.hca_cur[MLX5_CAP_ODP],
 	       MLX5_ST_SZ_BYTES(odp_cap));
 
-	/* set ODP SRQ support for RC/UD and XRC transports */
-	MLX5_SET(odp_cap, set_hca_cap, ud_odp_caps.srq_receive,
-		 MLX5_CAP_ODP_MAX(dev, ud_odp_caps.srq_receive));
-
-	MLX5_SET(odp_cap, set_hca_cap, rc_odp_caps.srq_receive,
-		 MLX5_CAP_ODP_MAX(dev, rc_odp_caps.srq_receive));
-
-	MLX5_SET(odp_cap, set_hca_cap, xrc_odp_caps.srq_receive,
-		 MLX5_CAP_ODP_MAX(dev, xrc_odp_caps.srq_receive));
+#define ODP_CAP_SET_MAX(dev, field)                                            \
+	do {                                                                   \
+		u32 _res = MLX5_CAP_ODP_MAX(dev, field);                       \
+		if (_res)                                                      \
+			MLX5_SET(odp_cap, set_hca_cap, field, _res);           \
+	} while (0)
+
+	ODP_CAP_SET_MAX(dev, ud_odp_caps.srq_receive);
+	ODP_CAP_SET_MAX(dev, rc_odp_caps.srq_receive);
+	ODP_CAP_SET_MAX(dev, xrc_odp_caps.srq_receive);
+	ODP_CAP_SET_MAX(dev, xrc_odp_caps.send);
+	ODP_CAP_SET_MAX(dev, xrc_odp_caps.receive);
+	ODP_CAP_SET_MAX(dev, xrc_odp_caps.write);
+	ODP_CAP_SET_MAX(dev, xrc_odp_caps.read);
+	ODP_CAP_SET_MAX(dev, xrc_odp_caps.atomic);
 
 	err = set_caps(dev, set_ctx, set_sz, MLX5_SET_HCA_CAP_OP_MOD_ODP);
 
Signature · 1 line
2.19.1
#1 lore raw
Quoted 9 lines · Leon Romanovsky

From: Moni Shoua <[email protected]>

ODP support for XRC transport is not enabled by default in FW, so we need separate ODP checks to enable/disable it.

While that, rewrite the set of ODP SRQ support capabilities in way that tests each field separately for clearness, which is not needed for current FW, but better to have it separated.

Quoted 6 lines
---
 .../net/ethernet/mellanox/mlx5/core/main.c    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

Thanks, applied to mlx5-next
f1463b9f1a97 net/mlx5: Separate ODP capabilities

Doug, Jason,

Can you please merge this branch into rdma-next as a preparation to pull request?

Thanks

#2 lore raw
Quoted 17 lines · Leon Romanovsky
Quoted 9 lines · Leon Romanovsky

From: Moni Shoua <[email protected]>

ODP support for XRC transport is not enabled by default in FW, so we need separate ODP checks to enable/disable it.

While that, rewrite the set of ODP SRQ support capabilities in way that tests each field separately for clearness, which is not needed for current FW, but better to have it separated.

Quoted 6 lines
---
 .../net/ethernet/mellanox/mlx5/core/main.c    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)
Quoted 7 lines

Thanks, applied to mlx5-next
f1463b9f1a97 net/mlx5: Separate ODP capabilities

Doug, Jason,

Can you please merge this branch into rdma-next as a preparation to pull request?

Sorry, it was a mistake, I dropped it.

Quoted 2 lines

Thanks