net/mlx5: ODP support for XRC transport is not enabled by default in FW
Subsystems (4)
PATCH 1/1 net/mlx5: ODP support for XRC transport is not enabled by default in FW
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 | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +22 -16
@@ -465,6 +465,7 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev)void *set_hca_cap;void *set_ctx;int set_sz; +bool do_set = false;int err; if (!IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING) ||
@@ -475,11 +476,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)
@@ -489,19 +485,29 @@ 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)); - - err =set_caps (dev, set_ctx, set_sz,MLX5_SET_HCA_CAP_OP_MOD_ODP ); +#define ODP_CAP_SET_MAX (dev, field) do { \ + u32 _res = MLX5_CAP_ODP_MAX(dev, field); \ + if (_res) { \ + do_set = true; \ + 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); + +if (do_set) + err =set_caps (dev, set_ctx, set_sz, +MLX5_SET_HCA_CAP_OP_MOD_ODP );kfree (set_ctx); +return err; }
Jason Gunthorpe
AppliedQuoted 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 8 lines
Signed-off-by Moni Shoua <[email protected]>Signed-off-by Leon Romanovsky <[email protected]>--- .../net/ethernet/mellanox/mlx5/core/main.c | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-)--
2.19.1
Applied to for-next, thanks
Jason