net/mlx5: Change define name for 0x100 lkey value

Change define of 0x100 lkey value from MLX5_INVALID_LKEY to be
MLX5_TERMINATE_SCATTER_LIST_LKEY as 0x100 is the value of
terminate_scatter_list_mkey.

Link: https://lore.kernel.org/r/3a116dc3fbae4cb6b76a63d27d418830b06ade0c.1673960981.git.leon@kernel.org
Signed-off-by: Or Har-Toov <ohartoov@nvidia.com>
Reviewed-by: Michael Guralnik <michaelgur@nvidia.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/mlx5/odp.c b/drivers/infiniband/hw/mlx5/odp.c
index e6e021a..b4ebead 100644 (file)
--- a/drivers/infiniband/hw/mlx5/odp.c
+++ b/drivers/infiniband/hw/mlx5/odp.c
@@ -986,7 +986,7 @@ static int pagefault_data_segments(struct mlx5_ib_dev *dev,
 {
        int ret = 0, npages = 0;
        u64 io_virt;
-       u32 key;
+       __be32 key;
        u32 byte_count;
        size_t bcnt;
        int inline_segment;
@@ -1000,7 +1000,7 @@ static int pagefault_data_segments(struct mlx5_ib_dev *dev,
                struct mlx5_wqe_data_seg *dseg = wqe;
 
                io_virt = be64_to_cpu(dseg->addr);
-               key = be32_to_cpu(dseg->lkey);
+               key = dseg->lkey;
                byte_count = be32_to_cpu(dseg->byte_count);
                inline_segment = !!(byte_count &  MLX5_INLINE_SEG);
                bcnt           = byte_count & ~MLX5_INLINE_SEG;
@@ -1014,8 +1014,8 @@ static int pagefault_data_segments(struct mlx5_ib_dev *dev,
                }
 
                /* receive WQE end of sg list. */
-               if (receive_queue && bcnt == 0 && key == MLX5_INVALID_LKEY &&
-                   io_virt == 0)
+               if (receive_queue && bcnt == 0 &&
+                   key == MLX5_TERMINATE_SCATTER_LIST_LKEY && io_virt == 0)
                        break;
 
                if (!inline_segment && total_wqe_bytes) {
@@ -1034,7 +1034,7 @@ static int pagefault_data_segments(struct mlx5_ib_dev *dev,
                        continue;
                }
 
-               ret = pagefault_single_data_segment(dev, NULL, key,
+               ret = pagefault_single_data_segment(dev, NULL, be32_to_cpu(key),
                                                    io_virt, bcnt,
                                                    &pfault->bytes_committed,
                                                    bytes_mapped);

diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 09b365a..0ac8d2c 100644 (file)
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -447,7 +447,7 @@ int mlx5_ib_post_srq_recv(struct ib_srq *ibsrq, const struct ib_recv_wr *wr,
 
                if (i < srq->msrq.max_avail_gather) {
                        scat[i].byte_count = 0;
-                       scat[i].lkey       = cpu_to_be32(MLX5_INVALID_LKEY);
+                       scat[i].lkey = MLX5_TERMINATE_SCATTER_LIST_LKEY;
                        scat[i].addr       = 0;
                }
        }

diff --git a/drivers/infiniband/hw/mlx5/wr.c b/drivers/infiniband/hw/mlx5/wr.c
index 855f3f4..bc44551 100644 (file)
--- a/drivers/infiniband/hw/mlx5/wr.c
+++ b/drivers/infiniband/hw/mlx5/wr.c
@@ -1252,7 +1252,7 @@ int mlx5_ib_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,
 
                if (i < qp->rq.max_gs) {
                        scat[i].byte_count = 0;
-                       scat[i].lkey       = cpu_to_be32(MLX5_INVALID_LKEY);
+                       scat[i].lkey = MLX5_TERMINATE_SCATTER_LIST_LKEY;
                        scat[i].addr       = 0;
                }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 85b5103..a941a48 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -829,7 +829,8 @@ static int mlx5e_alloc_rq(struct mlx5e_params *params,
                        /* check if num_frags is not a pow of two */
                        if (rq->wqe.info.num_frags < (1 << rq->wqe.info.log_num_frags)) {
                                wqe->data[f].byte_count = 0;
-                               wqe->data[f].lkey = cpu_to_be32(MLX5_INVALID_LKEY);
+                               wqe->data[f].lkey =
+                                       MLX5_TERMINATE_SCATTER_LIST_LKEY;
                                wqe->data[f].addr = 0;
                        }
                }

diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index 4657d5c..df55fbb 100644 (file)
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -36,7 +36,7 @@
 #include <linux/mlx5/device.h>
 #include <linux/mlx5/driver.h>
 
-#define MLX5_INVALID_LKEY      0x100
+#define MLX5_TERMINATE_SCATTER_LIST_LKEY cpu_to_be32(0x100)
 /* UMR (3 WQE_BB's) + SIG (3 WQE_BB's) + PSV (mem) + PSV (wire) */
 #define MLX5_SIG_WQE_SIZE      (MLX5_SEND_WQE_BB * 8)
 #define MLX5_DIF_SIZE          8