2 files changed, 13 insertions, 4 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
index d4585154151d..cc4fd61914d3 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -287,7 +287,7 @@ retry:
 
                         goto retry;
                 }
-                MLX5_SET64(manage_pages_in, in, pas[i], addr);
+                MLX5_ARRAY_SET64(manage_pages_in, in, pas, i, addr);
         }
 
         MLX5_SET(manage_pages_in, in, opcode, MLX5_CMD_OP_MANAGE_PAGES);
@@ -344,7 +344,7 @@ static int reclaim_pages_cmd(struct mlx5_core_dev *dev,
                 if (fwp->func_id != func_id)
                         continue;
 
-                MLX5_SET64(manage_pages_out, out, pas[i], fwp->addr);
+                MLX5_ARRAY_SET64(manage_pages_out, out, pas, i, fwp->addr);
                 i++;
         }
 
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 77c141797152..58276144ba81 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -92,12 +92,21 @@ __mlx5_mask(typ, fld))
         ___t; \
 })
 
-#define MLX5_SET64(typ, p, fld, v) do { \
+#define __MLX5_SET64(typ, p, fld, v) do { \
         BUILD_BUG_ON(__mlx5_bit_sz(typ, fld) != 64); \
-        BUILD_BUG_ON(__mlx5_bit_off(typ, fld) % 64); \
         *((__be64 *)(p) + __mlx5_64_off(typ, fld)) = cpu_to_be64(v); \
 } while (0)
 
+#define MLX5_SET64(typ, p, fld, v) do { \
+        BUILD_BUG_ON(__mlx5_bit_off(typ, fld) % 64); \
+        __MLX5_SET64(typ, p, fld, v); \
+} while (0)
+
+#define MLX5_ARRAY_SET64(typ, p, fld, idx, v) do { \
+        BUILD_BUG_ON(__mlx5_bit_off(typ, fld) % 64); \
+        __MLX5_SET64(typ, p, fld[idx], v); \
+} while (0)
+
 #define MLX5_GET64(typ, p, fld) be64_to_cpu(*((__be64 *)(p) + __mlx5_64_off(typ, fld)))
 
 #define MLX5_GET64_PR(typ, p, fld) ({ \