5 files changed, 11 insertions, 6 deletions

diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index eecac7b52bcb..28344773f640 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -620,7 +620,7 @@ static int create_cq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_cq *cq,
         }
         mlx5_fill_page_array(&cq->buf.buf, (*cqb)->pas);
 
-        (*cqb)->ctx.log_pg_sz = cq->buf.buf.page_shift - 12;
+        (*cqb)->ctx.log_pg_sz = cq->buf.buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT;
         *index = dev->mdev.priv.uuari.uars[0].index;
 
         return 0;
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 5bcf57943b84..7c6b4ba49bec 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -551,7 +551,7 @@ static int create_user_qp(struct mlx5_ib_dev *dev, struct ib_pd *pd,
         }
         mlx5_ib_populate_pas(dev, qp->umem, page_shift, (*in)->pas, 0);
         (*in)->ctx.log_pg_sz_remote_qpn =
-                cpu_to_be32((page_shift - 12) << 24);
+                cpu_to_be32((page_shift - MLX5_ADAPTER_PAGE_SHIFT) << 24);
         (*in)->ctx.params2 = cpu_to_be32(offset << 6);
 
         (*in)->ctx.qp_counter_set_usr_page = cpu_to_be32(uar_index);
@@ -648,7 +648,8 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev,
                 goto err_buf;
         }
         (*in)->ctx.qp_counter_set_usr_page = cpu_to_be32(uar_index);
-        (*in)->ctx.log_pg_sz_remote_qpn = cpu_to_be32((qp->buf.page_shift - 12) << 24);
+        (*in)->ctx.log_pg_sz_remote_qpn =
+                cpu_to_be32((qp->buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT) << 24);
         /* Set "fast registration enabled" for all kernel QPs */
         (*in)->ctx.params1 |= cpu_to_be32(1 << 11);
         (*in)->ctx.sq_crq_size |= cpu_to_be16(1 << 4);
diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index dbc2c7188c5e..210b3eaf188a 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -123,7 +123,7 @@ static int create_srq_user(struct ib_pd *pd, struct mlx5_ib_srq *srq,
                 goto err_in;
         }
 
-        (*in)->ctx.log_pg_sz = page_shift - 12;
+        (*in)->ctx.log_pg_sz = page_shift - MLX5_ADAPTER_PAGE_SHIFT;
         (*in)->ctx.pgoff_cqn = cpu_to_be32(offset << 26);
 
         return 0;
@@ -192,7 +192,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq,
         }
         srq->wq_sig = !!srq_signature;
 
-        (*in)->ctx.log_pg_sz = page_shift - 12;
+        (*in)->ctx.log_pg_sz = page_shift - MLX5_ADAPTER_PAGE_SHIFT;
 
         return 0;
 
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
index 6b4b436840bd..64a61b286b2c 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c
@@ -354,7 +354,7 @@ int mlx5_create_map_eq(struct mlx5_core_dev *dev, struct mlx5_eq *eq, u8 vecidx,
         in->hdr.opcode = cpu_to_be16(MLX5_CMD_OP_CREATE_EQ);
         in->ctx.log_sz_usr_page = cpu_to_be32(ilog2(eq->nent) << 24 | uar->index);
         in->ctx.intr = vecidx;
-        in->ctx.log_page_size = eq->buf.page_shift - 12;
+        in->ctx.log_page_size = eq->buf.page_shift - MLX5_ADAPTER_PAGE_SHIFT;
         in->events_mask = cpu_to_be64(mask);
 
         err = mlx5_cmd_exec(dev, in, inlen, &out, sizeof(out));
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 3d789f43e34b..da78875807fc 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -231,6 +231,10 @@ enum {
 };
 
 enum {
+        MLX5_ADAPTER_PAGE_SHIFT         = 12
+};
+
+enum {
         MLX5_CAP_OFF_DCT                = 41,
         MLX5_CAP_OFF_CMDIF_CSUM         = 46,
 };