{net,IB}/mlx5: QP/XRCD commands via mlx5 ifc

Remove old representation of manually created QP/XRCD commands layout
amd use mlx5_ifc canonical structures and defines.

Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>

2 files changed, 11 insertions, 102 deletions

diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index 2a39a06dbad4..cb94ac5b8420 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -1966,7 +1966,10 @@ struct mlx5_ifc_qpc_bits {
         u8         reserved_at_3e0[0x8];
         u8         cqn_snd[0x18];
 
-        u8         reserved_at_400[0x40];
+        u8         reserved_at_400[0x8];
+        u8         deth_sqpn[0x18];
+
+        u8         reserved_at_420[0x20];
 
         u8         reserved_at_440[0x8];
         u8         last_acked_psn[0x18];
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index 7879bf411891..16e1efecaf66 100644
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -123,12 +123,13 @@ enum {
 };
 
 enum {
-        MLX5_NON_ZERO_RQ        = 0 << 24,
-        MLX5_SRQ_RQ             = 1 << 24,
-        MLX5_CRQ_RQ             = 2 << 24,
-        MLX5_ZERO_LEN_RQ        = 3 << 24
+        MLX5_NON_ZERO_RQ        = 0x0,
+        MLX5_SRQ_RQ             = 0x1,
+        MLX5_CRQ_RQ             = 0x2,
+        MLX5_ZERO_LEN_RQ        = 0x3
 };
 
+/* TODO REM */
 enum {
         /* params1 */
         MLX5_QP_BIT_SRE                         = 1 << 15,
@@ -178,12 +179,6 @@ enum {
 };
 
 enum {
-        MLX5_QP_LAT_SENSITIVE   = 1 << 28,
-        MLX5_QP_BLOCK_MCAST     = 1 << 30,
-        MLX5_QP_ENABLE_SIG      = 1 << 31,
-};
-
-enum {
         MLX5_RCV_DBR    = 0,
         MLX5_SND_DBR    = 1,
 };
@@ -525,34 +520,6 @@ struct mlx5_qp_context {
         u8                      rsvd1[24];
 };
 
-struct mlx5_create_qp_mbox_in {
-        struct mlx5_inbox_hdr   hdr;
-        __be32                  input_qpn;
-        u8                      rsvd0[4];
-        __be32                  opt_param_mask;
-        u8                      rsvd1[4];
-        struct mlx5_qp_context  ctx;
-        u8                      rsvd3[16];
-        __be64                  pas[0];
-};
-
-struct mlx5_create_qp_mbox_out {
-        struct mlx5_outbox_hdr  hdr;
-        __be32                  qpn;
-        u8                      rsvd0[4];
-};
-
-struct mlx5_destroy_qp_mbox_in {
-        struct mlx5_inbox_hdr   hdr;
-        __be32                  qpn;
-        u8                      rsvd0[4];
-};
-
-struct mlx5_destroy_qp_mbox_out {
-        struct mlx5_outbox_hdr  hdr;
-        u8                      rsvd0[8];
-};
-
 struct mlx5_modify_qp_mbox_in {
         struct mlx5_inbox_hdr   hdr;
         __be32                  qpn;
@@ -568,56 +535,6 @@ struct mlx5_modify_qp_mbox_out {
         u8                      rsvd0[8];
 };
 
-struct mlx5_query_qp_mbox_in {
-        struct mlx5_inbox_hdr   hdr;
-        __be32                  qpn;
-        u8                      rsvd[4];
-};
-
-struct mlx5_query_qp_mbox_out {
-        struct mlx5_outbox_hdr  hdr;
-        u8                      rsvd1[8];
-        __be32                  optparam;
-        u8                      rsvd0[4];
-        struct mlx5_qp_context  ctx;
-        u8                      rsvd2[16];
-        __be64                  pas[0];
-};
-
-struct mlx5_conf_sqp_mbox_in {
-        struct mlx5_inbox_hdr   hdr;
-        __be32                  qpn;
-        u8                      rsvd[3];
-        u8                      type;
-};
-
-struct mlx5_conf_sqp_mbox_out {
-        struct mlx5_outbox_hdr  hdr;
-        u8                      rsvd[8];
-};
-
-struct mlx5_alloc_xrcd_mbox_in {
-        struct mlx5_inbox_hdr   hdr;
-        u8                      rsvd[8];
-};
-
-struct mlx5_alloc_xrcd_mbox_out {
-        struct mlx5_outbox_hdr  hdr;
-        __be32                  xrcdn;
-        u8                      rsvd[4];
-};
-
-struct mlx5_dealloc_xrcd_mbox_in {
-        struct mlx5_inbox_hdr   hdr;
-        __be32                  xrcdn;
-        u8                      rsvd[4];
-};
-
-struct mlx5_dealloc_xrcd_mbox_out {
-        struct mlx5_outbox_hdr  hdr;
-        u8                      rsvd[8];
-};
-
 static inline struct mlx5_core_qp *__mlx5_qp_lookup(struct mlx5_core_dev *dev, u32 qpn)
 {
         return radix_tree_lookup(&dev->priv.qp_table.tree, qpn);
@@ -628,20 +545,9 @@ static inline struct mlx5_core_mkey *__mlx5_mr_lookup(struct mlx5_core_dev *dev,
         return radix_tree_lookup(&dev->priv.mkey_table.tree, key);
 }
 
-struct mlx5_page_fault_resume_mbox_in {
-        struct mlx5_inbox_hdr   hdr;
-        __be32                  flags_qpn;
-        u8                      reserved[4];
-};
-
-struct mlx5_page_fault_resume_mbox_out {
-        struct mlx5_outbox_hdr  hdr;
-        u8                      rsvd[8];
-};
-
 int mlx5_core_create_qp(struct mlx5_core_dev *dev,
                         struct mlx5_core_qp *qp,
-                        struct mlx5_create_qp_mbox_in *in,
+                        u32 *in,
                         int inlen);
 int mlx5_core_qp_modify(struct mlx5_core_dev *dev, u16 operation,
                         struct mlx5_modify_qp_mbox_in *in, int sqd_event,
@@ -649,7 +555,7 @@ int mlx5_core_qp_modify(struct mlx5_core_dev *dev, u16 operation,
 int mlx5_core_destroy_qp(struct mlx5_core_dev *dev,
                          struct mlx5_core_qp *qp);
 int mlx5_core_qp_query(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp,
-                       struct mlx5_query_qp_mbox_out *out, int outlen);
+                       u32 *out, int outlen);
 
 int mlx5_core_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn);
 int mlx5_core_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn);