2 files changed, 27 insertions, 4 deletions

diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index 5eb4e31af22b..da78875807fc 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -230,6 +230,15 @@ enum {
         MLX5_MAX_PAGE_SHIFT             = 31
 };
 
+enum {
+        MLX5_ADAPTER_PAGE_SHIFT         = 12
+};
+
+enum {
+        MLX5_CAP_OFF_DCT                = 41,
+        MLX5_CAP_OFF_CMDIF_CSUM         = 46,
+};
+
 struct mlx5_inbox_hdr {
         __be16          opcode;
         u8              rsvd[4];
@@ -319,9 +328,9 @@ struct mlx5_hca_cap {
         u8      rsvd25[42];
         __be16  log_uar_page_sz;
         u8      rsvd26[28];
-        u8      log_msx_atomic_size_qp;
+        u8      log_max_atomic_size_qp;
         u8      rsvd27[2];
-        u8      log_msx_atomic_size_dc;
+        u8      log_max_atomic_size_dc;
         u8      rsvd28[76];
 };
 
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 6b8c496572c8..554548cd3dd4 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -483,6 +483,7 @@ struct mlx5_priv {
         struct rb_root          page_root;
         int                     fw_pages;
         int                     reg_pages;
+        struct list_head        free_list;
 
         struct mlx5_core_health health;
 
@@ -557,9 +558,11 @@ typedef void (*mlx5_cmd_cbk_t)(int status, void *context);
 struct mlx5_cmd_work_ent {
         struct mlx5_cmd_msg    *in;
         struct mlx5_cmd_msg    *out;
+        void                   *uout;
+        int                     uout_size;
         mlx5_cmd_cbk_t          callback;
         void                   *context;
-        int idx;
+        int                     idx;
         struct completion       done;
         struct mlx5_cmd        *cmd;
         struct work_struct      work;
@@ -570,6 +573,7 @@ struct mlx5_cmd_work_ent {
         u8                      token;
         struct timespec         ts1;
         struct timespec         ts2;
+        u16                     op;
 };
 
 struct mlx5_pas {
@@ -653,6 +657,9 @@ void mlx5_cmd_use_polling(struct mlx5_core_dev *dev);
 int mlx5_cmd_status_to_err(struct mlx5_outbox_hdr *hdr);
 int mlx5_cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out,
                   int out_size);
+int mlx5_cmd_exec_cb(struct mlx5_core_dev *dev, void *in, int in_size,
+                     void *out, int out_size, mlx5_cmd_cbk_t callback,
+                     void *context);
 int mlx5_cmd_alloc_uar(struct mlx5_core_dev *dev, u32 *uarn);
 int mlx5_cmd_free_uar(struct mlx5_core_dev *dev, u32 uarn);
 int mlx5_alloc_uuars(struct mlx5_core_dev *dev, struct mlx5_uuar_info *uuari);
@@ -676,7 +683,9 @@ int mlx5_core_query_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
 int mlx5_core_arm_srq(struct mlx5_core_dev *dev, struct mlx5_core_srq *srq,
                       u16 lwm, int is_srq);
 int mlx5_core_create_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
-                          struct mlx5_create_mkey_mbox_in *in, int inlen);
+                          struct mlx5_create_mkey_mbox_in *in, int inlen,
+                          mlx5_cmd_cbk_t callback, void *context,
+                          struct mlx5_create_mkey_mbox_out *out);
 int mlx5_core_destroy_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr);
 int mlx5_core_query_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
                          struct mlx5_query_mkey_mbox_out *out, int outlen);
@@ -745,6 +754,11 @@ static inline u32 mlx5_idx_to_mkey(u32 mkey_idx)
         return mkey_idx << 8;
 }
 
+static inline u8 mlx5_mkey_variant(u32 mkey)
+{
+        return mkey & 0xff;
+}
+
 enum {
         MLX5_PROF_MASK_QP_SIZE          = (u64)1 << 0,
         MLX5_PROF_MASK_MR_CACHE         = (u64)1 << 1,