Skip to content

Commit 05884a9

Browse files
jgunthorpegregkh
authored andcommitted
RDMA/mlx5: Use set_mkc_access_pd_addr_fields() in reg_create()
[ Upstream commit 1c97ca3 ] reg_create() open codes this helper, use the shared code. Link: https://lore.kernel.org/r/20200914112653.345244-3-leon@kernel.org Signed-off-by: Leon Romanovsky <leonro@nvidia.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent c752aab commit 05884a9

1 file changed

Lines changed: 1 addition & 14 deletions

File tree

  • drivers/infiniband/hw/mlx5

drivers/infiniband/hw/mlx5/mr.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,29 +1190,16 @@ static struct mlx5_ib_mr *reg_create(struct ib_mr *ibmr, struct ib_pd *pd,
11901190
MLX5_SET(create_mkey_in, in, pg_access, !!(pg_cap));
11911191

11921192
mkc = MLX5_ADDR_OF(create_mkey_in, in, memory_key_mkey_entry);
1193+
set_mkc_access_pd_addr_fields(mkc, access_flags, virt_addr, pd);
11931194
MLX5_SET(mkc, mkc, free, !populate);
11941195
MLX5_SET(mkc, mkc, access_mode_1_0, MLX5_MKC_ACCESS_MODE_MTT);
1195-
if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write))
1196-
MLX5_SET(mkc, mkc, relaxed_ordering_write,
1197-
!!(access_flags & IB_ACCESS_RELAXED_ORDERING));
1198-
if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read))
1199-
MLX5_SET(mkc, mkc, relaxed_ordering_read,
1200-
!!(access_flags & IB_ACCESS_RELAXED_ORDERING));
1201-
MLX5_SET(mkc, mkc, a, !!(access_flags & IB_ACCESS_REMOTE_ATOMIC));
1202-
MLX5_SET(mkc, mkc, rw, !!(access_flags & IB_ACCESS_REMOTE_WRITE));
1203-
MLX5_SET(mkc, mkc, rr, !!(access_flags & IB_ACCESS_REMOTE_READ));
1204-
MLX5_SET(mkc, mkc, lw, !!(access_flags & IB_ACCESS_LOCAL_WRITE));
1205-
MLX5_SET(mkc, mkc, lr, 1);
12061196
MLX5_SET(mkc, mkc, umr_en, 1);
12071197

1208-
MLX5_SET64(mkc, mkc, start_addr, virt_addr);
12091198
MLX5_SET64(mkc, mkc, len, length);
1210-
MLX5_SET(mkc, mkc, pd, to_mpd(pd)->pdn);
12111199
MLX5_SET(mkc, mkc, bsf_octword_size, 0);
12121200
MLX5_SET(mkc, mkc, translations_octword_size,
12131201
get_octo_len(virt_addr, length, page_shift));
12141202
MLX5_SET(mkc, mkc, log_page_size, page_shift);
1215-
MLX5_SET(mkc, mkc, qpn, 0xffffff);
12161203
if (populate) {
12171204
MLX5_SET(create_mkey_in, in, translations_octword_actual_size,
12181205
get_octo_len(virt_addr, length, page_shift));

0 commit comments

Comments
 (0)