3 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index e92d1bfdb330..7a7f9c1e679a 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -123,8 +123,8 @@ enum {
         MLX4_OPCODE_RDMA_READ           = 0x10,
         MLX4_OPCODE_ATOMIC_CS           = 0x11,
         MLX4_OPCODE_ATOMIC_FA           = 0x12,
-        MLX4_OPCODE_ATOMIC_MASK_CS      = 0x14,
-        MLX4_OPCODE_ATOMIC_MASK_FA      = 0x15,
+        MLX4_OPCODE_MASKED_ATOMIC_CS    = 0x14,
+        MLX4_OPCODE_MASKED_ATOMIC_FA    = 0x15,
         MLX4_OPCODE_BIND_MW             = 0x18,
         MLX4_OPCODE_FMR                 = 0x19,
         MLX4_OPCODE_LOCAL_INVAL         = 0x1b,
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 9f29d86e5dc9..7abe64326f72 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -285,6 +285,13 @@ struct mlx4_wqe_atomic_seg {
         __be64                  compare;
 };
 
+struct mlx4_wqe_masked_atomic_seg {
+        __be64                  swap_add;
+        __be64                  compare;
+        __be64                  swap_add_mask;
+        __be64                  compare_mask;
+};
+
 struct mlx4_wqe_data_seg {
         __be32                  byte_count;
         __be32                  lkey;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index a585e0f92bc3..310d31474034 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -136,6 +136,7 @@ struct ib_device_attr {
         int                     max_qp_init_rd_atom;
         int                     max_ee_init_rd_atom;
         enum ib_atomic_cap      atomic_cap;
+        enum ib_atomic_cap      masked_atomic_cap;
         int                     max_ee;
         int                     max_rdd;
         int                     max_mw;
@@ -467,6 +468,8 @@ enum ib_wc_opcode {
         IB_WC_LSO,
         IB_WC_LOCAL_INV,
         IB_WC_FAST_REG_MR,
+        IB_WC_MASKED_COMP_SWAP,
+        IB_WC_MASKED_FETCH_ADD,
 /*
  * Set value of IB_WC_RECV so consumers can test if a completion is a
  * receive by testing (opcode & IB_WC_RECV).
@@ -689,6 +692,8 @@ enum ib_wr_opcode {
         IB_WR_RDMA_READ_WITH_INV,
         IB_WR_LOCAL_INV,
         IB_WR_FAST_REG_MR,
+        IB_WR_MASKED_ATOMIC_CMP_AND_SWP,
+        IB_WR_MASKED_ATOMIC_FETCH_AND_ADD,
 };
 
 enum ib_send_flags {
@@ -731,6 +736,8 @@ struct ib_send_wr {
                         u64     remote_addr;
                         u64     compare_add;
                         u64     swap;
+                        u64     compare_add_mask;
+                        u64     swap_mask;
                         u32     rkey;
                 } atomic;
                 struct {