Commit ba6a9c68 authored by Aharon Landau's avatar Aharon Landau Committed by Jason Gunthorpe

RDMA/mlx5: Simplify get_umr_update_access_mask()

Instead of getting the update access capabilities each call to
get_umr_update_access_mask(), pass struct mlx5_ib_dev and get the
capabilities inside the function.

Link: https://lore.kernel.org/r/f22b8a84ef32e29ada26691f06b57e2ed5943b76.1649747695.git.leonro@nvidia.comSigned-off-by: default avatarAharon Landau <aharonl@nvidia.com>
Reviewed-by: default avatarMichael Guralnik <michaelgur@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 8a8a5d37
...@@ -34,9 +34,7 @@ static __be64 get_umr_update_translation_mask(void) ...@@ -34,9 +34,7 @@ static __be64 get_umr_update_translation_mask(void)
return cpu_to_be64(result); return cpu_to_be64(result);
} }
static __be64 get_umr_update_access_mask(int atomic, static __be64 get_umr_update_access_mask(struct mlx5_ib_dev *dev)
int relaxed_ordering_write,
int relaxed_ordering_read)
{ {
u64 result; u64 result;
...@@ -45,13 +43,13 @@ static __be64 get_umr_update_access_mask(int atomic, ...@@ -45,13 +43,13 @@ static __be64 get_umr_update_access_mask(int atomic,
MLX5_MKEY_MASK_RR | MLX5_MKEY_MASK_RR |
MLX5_MKEY_MASK_RW; MLX5_MKEY_MASK_RW;
if (atomic) if (MLX5_CAP_GEN(dev->mdev, atomic))
result |= MLX5_MKEY_MASK_A; result |= MLX5_MKEY_MASK_A;
if (relaxed_ordering_write) if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write_umr))
result |= MLX5_MKEY_MASK_RELAXED_ORDERING_WRITE; result |= MLX5_MKEY_MASK_RELAXED_ORDERING_WRITE;
if (relaxed_ordering_read) if (MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read_umr))
result |= MLX5_MKEY_MASK_RELAXED_ORDERING_READ; result |= MLX5_MKEY_MASK_RELAXED_ORDERING_READ;
return cpu_to_be64(result); return cpu_to_be64(result);
...@@ -116,10 +114,7 @@ int mlx5r_umr_set_umr_ctrl_seg(struct mlx5_ib_dev *dev, ...@@ -116,10 +114,7 @@ int mlx5r_umr_set_umr_ctrl_seg(struct mlx5_ib_dev *dev,
if (wr->send_flags & MLX5_IB_SEND_UMR_UPDATE_TRANSLATION) if (wr->send_flags & MLX5_IB_SEND_UMR_UPDATE_TRANSLATION)
umr->mkey_mask |= get_umr_update_translation_mask(); umr->mkey_mask |= get_umr_update_translation_mask();
if (wr->send_flags & MLX5_IB_SEND_UMR_UPDATE_PD_ACCESS) { if (wr->send_flags & MLX5_IB_SEND_UMR_UPDATE_PD_ACCESS) {
umr->mkey_mask |= get_umr_update_access_mask( umr->mkey_mask |= get_umr_update_access_mask(dev);
!!MLX5_CAP_GEN(dev->mdev, atomic),
!!MLX5_CAP_GEN(dev->mdev, relaxed_ordering_write_umr),
!!MLX5_CAP_GEN(dev->mdev, relaxed_ordering_read_umr));
umr->mkey_mask |= get_umr_update_pd_mask(); umr->mkey_mask |= get_umr_update_pd_mask();
} }
if (wr->send_flags & MLX5_IB_SEND_UMR_ENABLE_MR) if (wr->send_flags & MLX5_IB_SEND_UMR_ENABLE_MR)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment