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

Prior to this patch we assumed that modify QP commands have the
same layout.

In ConnectX-4 for each QP transition there is a specific command
and their layout can vary.

e.g: 2err/2rst commands don't have QP context in their layout and before
this patch we posted the QP context in those commands.

Fortunately the FW only checks the suffix of the commands and executes
them, while ignoring all invalid data sent after the valid command
layout.

This patch removes mlx5_modify_qp_mbox_in and changes
mlx5_core_qp_modify to receive the required transition and QP context
with opt_param_mask if needed.  This way the caller is not required to
provide the command inbox layout and it will be generated automatically.

mlx5_core_qp_modify will generate the command inbox/outbox layouts
according to the requested transition and will fill the requested
parameters.

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

1 files changed, 6 insertions, 16 deletions

diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index d22492ff863e..626173736749 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -1871,7 +1871,6 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp)
 {
         struct mlx5_ib_cq *send_cq, *recv_cq;
         struct mlx5_ib_qp_base *base = &qp->trans_qp.base;
-        struct mlx5_modify_qp_mbox_in *in;
         unsigned long flags;
         int err;
 
@@ -1884,16 +1883,12 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp)
                &qp->raw_packet_qp.rq.base :
                &qp->trans_qp.base;
 
-        in = kzalloc(sizeof(*in), GFP_KERNEL);
-        if (!in)
-                return;
-
         if (qp->state != IB_QPS_RESET) {
                 if (qp->ibqp.qp_type != IB_QPT_RAW_PACKET) {
                         mlx5_ib_qp_disable_pagefaults(qp);
                         err = mlx5_core_qp_modify(dev->mdev,
-                                                  MLX5_CMD_OP_2RST_QP, in, 0,
-                                                  &base->mqp);
+                                                  MLX5_CMD_OP_2RST_QP, 0,
+                                                  NULL, &base->mqp);
                 } else {
                         err = modify_raw_packet_qp(dev, qp,
                                                    MLX5_CMD_OP_2RST_QP);
@@ -1935,8 +1930,6 @@ static void destroy_qp_common(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp)
                                      base->mqp.qpn);
         }
 
-        kfree(in);
-
         if (qp->create_type == MLX5_QP_KERNEL)
                 destroy_qp_kernel(dev, qp);
         else if (qp->create_type == MLX5_QP_USER)
@@ -2522,7 +2515,6 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         struct mlx5_ib_qp_base *base = &qp->trans_qp.base;
         struct mlx5_ib_cq *send_cq, *recv_cq;
         struct mlx5_qp_context *context;
-        struct mlx5_modify_qp_mbox_in *in;
         struct mlx5_ib_pd *pd;
         enum mlx5_qp_state mlx5_cur, mlx5_new;
         enum mlx5_qp_optpar optpar;
@@ -2531,11 +2523,10 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         int err;
         u16 op;
 
-        in = kzalloc(sizeof(*in), GFP_KERNEL);
-        if (!in)
+        context = kzalloc(sizeof(*context), GFP_KERNEL);
+        if (!context)
                 return -ENOMEM;
 
-        context = &in->ctx;
         err = to_mlx5_st(ibqp->qp_type);
         if (err < 0) {
                 mlx5_ib_dbg(dev, "unsupported qp type %d\n", ibqp->qp_type);
@@ -2700,12 +2691,11 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         op = optab[mlx5_cur][mlx5_new];
         optpar = ib_mask_to_mlx5_opt(attr_mask);
         optpar &= opt_mask[mlx5_cur][mlx5_new][mlx5_st];
-        in->optparam = cpu_to_be32(optpar);
 
         if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET)
                 err = modify_raw_packet_qp(dev, qp, op);
         else
-                err = mlx5_core_qp_modify(dev->mdev, op, in, sqd_event,
+                err = mlx5_core_qp_modify(dev->mdev, op, optpar, context,
                                           &base->mqp);
         if (err)
                 goto out;
@@ -2746,7 +2736,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         }
 
 out:
-        kfree(in);
+        kfree(context);
         return err;
 }