4 files changed, 275 insertions, 12 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index cb9bebe28276..662a3c5da739 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -950,7 +950,7 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .out_is_imm = false,
                 .encode_slave_id = false,
                 .verify = NULL,
-                .wrapper = mlx4_GEN_QP_wrapper
+                .wrapper = mlx4_INIT2INIT_QP_wrapper
         },
         {
                 .opcode = MLX4_CMD_INIT2RTR_QP,
@@ -968,7 +968,7 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .out_is_imm = false,
                 .encode_slave_id = false,
                 .verify = NULL,
-                .wrapper = mlx4_GEN_QP_wrapper
+                .wrapper = mlx4_RTR2RTS_QP_wrapper
         },
         {
                 .opcode = MLX4_CMD_RTS2RTS_QP,
@@ -977,7 +977,7 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .out_is_imm = false,
                 .encode_slave_id = false,
                 .verify = NULL,
-                .wrapper = mlx4_GEN_QP_wrapper
+                .wrapper = mlx4_RTS2RTS_QP_wrapper
         },
         {
                 .opcode = MLX4_CMD_SQERR2RTS_QP,
@@ -986,7 +986,7 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .out_is_imm = false,
                 .encode_slave_id = false,
                 .verify = NULL,
-                .wrapper = mlx4_GEN_QP_wrapper
+                .wrapper = mlx4_SQERR2RTS_QP_wrapper
         },
         {
                 .opcode = MLX4_CMD_2ERR_QP,
@@ -1013,7 +1013,7 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .out_is_imm = false,
                 .encode_slave_id = false,
                 .verify = NULL,
-                .wrapper = mlx4_GEN_QP_wrapper
+                .wrapper = mlx4_SQD2SQD_QP_wrapper
         },
         {
                 .opcode = MLX4_CMD_SQD2RTS_QP,
@@ -1022,7 +1022,7 @@ static struct mlx4_cmd_info cmd_info[] = {
                 .out_is_imm = false,
                 .encode_slave_id = false,
                 .verify = NULL,
-                .wrapper = mlx4_GEN_QP_wrapper
+                .wrapper = mlx4_SQD2RTS_QP_wrapper
         },
         {
                 .opcode = MLX4_CMD_2RST_QP,
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 06ef3afbc49a..2294b7173180 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -424,6 +424,17 @@ int mlx4_get_parav_qkey(struct mlx4_dev *dev, u32 qpn, u32 *qkey)
 }
 EXPORT_SYMBOL(mlx4_get_parav_qkey);
 
+void mlx4_sync_pkey_table(struct mlx4_dev *dev, int slave, int port, int i, int val)
+{
+        struct mlx4_priv *priv = container_of(dev, struct mlx4_priv, dev);
+
+        if (!mlx4_is_master(dev))
+                return;
+
+        priv->virt2phys_pkey[slave][port - 1][i] = val;
+}
+EXPORT_SYMBOL(mlx4_sync_pkey_table);
+
 int mlx4_is_slave_active(struct mlx4_dev *dev, int slave)
 {
         struct mlx4_priv *priv = mlx4_priv(dev);
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
index dba69d98734a..7d27c3158d0c 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@ -807,6 +807,8 @@ struct mlx4_priv {
         struct io_mapping       *bf_mapping;
         int                     reserved_mtts;
         int                     fs_hash_mode;
+        u8 virt2phys_pkey[MLX4_MFUNC_MAX][MLX4_MAX_PORTS][MLX4_MAX_PORT_PKEYS];
+
 };
 
 static inline struct mlx4_priv *mlx4_priv(struct mlx4_dev *dev)
@@ -1011,16 +1013,61 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
                              struct mlx4_cmd_mailbox *inbox,
                              struct mlx4_cmd_mailbox *outbox,
                              struct mlx4_cmd_info *cmd);
+int mlx4_INIT2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
+                              struct mlx4_vhcr *vhcr,
+                              struct mlx4_cmd_mailbox *inbox,
+                              struct mlx4_cmd_mailbox *outbox,
+                              struct mlx4_cmd_info *cmd);
 int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave,
                              struct mlx4_vhcr *vhcr,
                              struct mlx4_cmd_mailbox *inbox,
                              struct mlx4_cmd_mailbox *outbox,
                              struct mlx4_cmd_info *cmd);
+int mlx4_RTR2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd);
+int mlx4_RTS2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd);
+int mlx4_SQERR2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
+                              struct mlx4_vhcr *vhcr,
+                              struct mlx4_cmd_mailbox *inbox,
+                              struct mlx4_cmd_mailbox *outbox,
+                              struct mlx4_cmd_info *cmd);
+int mlx4_2ERR_QP_wrapper(struct mlx4_dev *dev, int slave,
+                         struct mlx4_vhcr *vhcr,
+                         struct mlx4_cmd_mailbox *inbox,
+                         struct mlx4_cmd_mailbox *outbox,
+                         struct mlx4_cmd_info *cmd);
+int mlx4_RTS2SQD_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd);
+int mlx4_SQD2SQD_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd);
+int mlx4_SQD2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd);
 int mlx4_2RST_QP_wrapper(struct mlx4_dev *dev, int slave,
                          struct mlx4_vhcr *vhcr,
                          struct mlx4_cmd_mailbox *inbox,
                          struct mlx4_cmd_mailbox *outbox,
                          struct mlx4_cmd_info *cmd);
+int mlx4_QUERY_QP_wrapper(struct mlx4_dev *dev, int slave,
+                          struct mlx4_vhcr *vhcr,
+                          struct mlx4_cmd_mailbox *inbox,
+                          struct mlx4_cmd_mailbox *outbox,
+                          struct mlx4_cmd_info *cmd);
 
 int mlx4_GEN_EQE(struct mlx4_dev *dev, int slave, struct mlx4_eqe *eqe);
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index 3c57a83e6287..49e9de725d0a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -242,6 +242,15 @@ static int res_tracker_insert(struct rb_root *root, struct res_common *res)
         return 0;
 }
 
+enum qp_transition {
+        QP_TRANS_INIT2RTR,
+        QP_TRANS_RTR2RTS,
+        QP_TRANS_RTS2RTS,
+        QP_TRANS_SQERR2RTS,
+        QP_TRANS_SQD2SQD,
+        QP_TRANS_SQD2RTS
+};
+
 /* For Debug uses */
 static const char *ResourceType(enum mlx4_resource rt)
 {
@@ -308,14 +317,41 @@ void mlx4_free_resource_tracker(struct mlx4_dev *dev,
         }
 }
 
-static void update_ud_gid(struct mlx4_dev *dev,
-                          struct mlx4_qp_context *qp_ctx, u8 slave)
+static void update_pkey_index(struct mlx4_dev *dev, int slave,
+                              struct mlx4_cmd_mailbox *inbox)
 {
-        u32 ts = (be32_to_cpu(qp_ctx->flags) >> 16) & 0xff;
+        u8 sched = *(u8 *)(inbox->buf + 64);
+        u8 orig_index = *(u8 *)(inbox->buf + 35);
+        u8 new_index;
+        struct mlx4_priv *priv = mlx4_priv(dev);
+        int port;
+
+        port = (sched >> 6 & 1) + 1;
+
+        new_index = priv->virt2phys_pkey[slave][port - 1][orig_index];
+        *(u8 *)(inbox->buf + 35) = new_index;
+
+        mlx4_dbg(dev, "port = %d, orig pkey index = %d, "
+                 "new pkey index = %d\n", port, orig_index, new_index);
+}
+
+static void update_gid(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *inbox,
+                       u8 slave)
+{
+        struct mlx4_qp_context  *qp_ctx = inbox->buf + 8;
+        enum mlx4_qp_optpar     optpar = be32_to_cpu(*(__be32 *) inbox->buf);
+        u32                     ts = (be32_to_cpu(qp_ctx->flags) >> 16) & 0xff;
 
         if (MLX4_QP_ST_UD == ts)
                 qp_ctx->pri_path.mgid_index = 0x80 | slave;
 
+        if (MLX4_QP_ST_RC == ts || MLX4_QP_ST_UC == ts) {
+                if (optpar & MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH)
+                        qp_ctx->pri_path.mgid_index = slave & 0x7F;
+                if (optpar & MLX4_QP_OPTPAR_ALT_ADDR_PATH)
+                        qp_ctx->alt_path.mgid_index = slave & 0x7F;
+        }
+
         mlx4_dbg(dev, "slave %d, new gid index: 0x%x ",
                 slave, qp_ctx->pri_path.mgid_index);
 }
@@ -1109,6 +1145,11 @@ static int valid_reserved(struct mlx4_dev *dev, int slave, int qpn)
                 (mlx4_is_master(dev) || mlx4_is_guest_proxy(dev, slave, qpn));
 }
 
+static int fw_reserved(struct mlx4_dev *dev, int qpn)
+{
+        return qpn < dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FW];
+}
+
 static int qp_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
                         u64 in_param, u64 *out_param)
 {
@@ -1146,7 +1187,7 @@ static int qp_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
                 if (err)
                         return err;
 
-                if (!valid_reserved(dev, slave, qpn)) {
+                if (!fw_reserved(dev, qpn)) {
                         err = __mlx4_qp_alloc_icm(dev, qpn);
                         if (err) {
                                 res_abort_move(dev, slave, RES_QP, qpn);
@@ -1499,7 +1540,7 @@ static int qp_free_res(struct mlx4_dev *dev, int slave, int op, int cmd,
                 if (err)
                         return err;
 
-                if (!valid_reserved(dev, slave, qpn))
+                if (!fw_reserved(dev, qpn))
                         __mlx4_qp_free_icm(dev, qpn);
 
                 res_end_move(dev, slave, RES_QP, qpn);
@@ -1939,6 +1980,19 @@ static u32 qp_get_srqn(struct mlx4_qp_context *qpc)
         return be32_to_cpu(qpc->srqn) & 0x1ffffff;
 }
 
+static void adjust_proxy_tun_qkey(struct mlx4_dev *dev, struct mlx4_vhcr *vhcr,
+                                  struct mlx4_qp_context *context)
+{
+        u32 qpn = vhcr->in_modifier & 0xffffff;
+        u32 qkey = 0;
+
+        if (mlx4_get_parav_qkey(dev, qpn, &qkey))
+                return;
+
+        /* adjust qkey in qp context */
+        context->qkey = cpu_to_be32(qkey);
+}
+
 int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
                              struct mlx4_vhcr *vhcr,
                              struct mlx4_cmd_mailbox *inbox,
@@ -1991,6 +2045,8 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
                         goto ex_put_scq;
         }
 
+        adjust_proxy_tun_qkey(dev, vhcr, qpc);
+        update_pkey_index(dev, slave, inbox);
         err = mlx4_DMA_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
         if (err)
                 goto ex_put_srq;
@@ -2136,6 +2192,48 @@ static int get_containing_mtt(struct mlx4_dev *dev, int slave, int start,
         return err;
 }
 
+static int verify_qp_parameters(struct mlx4_dev *dev,
+                                struct mlx4_cmd_mailbox *inbox,
+                                enum qp_transition transition, u8 slave)
+{
+        u32                     qp_type;
+        struct mlx4_qp_context  *qp_ctx;
+        enum mlx4_qp_optpar     optpar;
+
+        qp_ctx  = inbox->buf + 8;
+        qp_type = (be32_to_cpu(qp_ctx->flags) >> 16) & 0xff;
+        optpar  = be32_to_cpu(*(__be32 *) inbox->buf);
+
+        switch (qp_type) {
+        case MLX4_QP_ST_RC:
+        case MLX4_QP_ST_UC:
+                switch (transition) {
+                case QP_TRANS_INIT2RTR:
+                case QP_TRANS_RTR2RTS:
+                case QP_TRANS_RTS2RTS:
+                case QP_TRANS_SQD2SQD:
+                case QP_TRANS_SQD2RTS:
+                        if (slave != mlx4_master_func_num(dev))
+                                /* slaves have only gid index 0 */
+                                if (optpar & MLX4_QP_OPTPAR_PRIMARY_ADDR_PATH)
+                                        if (qp_ctx->pri_path.mgid_index)
+                                                return -EINVAL;
+                                if (optpar & MLX4_QP_OPTPAR_ALT_ADDR_PATH)
+                                        if (qp_ctx->alt_path.mgid_index)
+                                                return -EINVAL;
+                        break;
+                default:
+                        break;
+                }
+
+                break;
+        default:
+                break;
+        }
+
+        return 0;
+}
+
 int mlx4_WRITE_MTT_wrapper(struct mlx4_dev *dev, int slave,
                            struct mlx4_vhcr *vhcr,
                            struct mlx4_cmd_mailbox *inbox,
@@ -2623,16 +2721,123 @@ out:
         return err;
 }
 
+int mlx4_INIT2INIT_QP_wrapper(struct mlx4_dev *dev, int slave,
+                              struct mlx4_vhcr *vhcr,
+                              struct mlx4_cmd_mailbox *inbox,
+                              struct mlx4_cmd_mailbox *outbox,
+                              struct mlx4_cmd_info *cmd)
+{
+        struct mlx4_qp_context *context = inbox->buf + 8;
+        adjust_proxy_tun_qkey(dev, vhcr, context);
+        update_pkey_index(dev, slave, inbox);
+        return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
+}
+
 int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave,
                              struct mlx4_vhcr *vhcr,
                              struct mlx4_cmd_mailbox *inbox,
                              struct mlx4_cmd_mailbox *outbox,
                              struct mlx4_cmd_info *cmd)
 {
+        int err;
         struct mlx4_qp_context *qpc = inbox->buf + 8;
 
-        update_ud_gid(dev, qpc, (u8)slave);
+        err = verify_qp_parameters(dev, inbox, QP_TRANS_INIT2RTR, slave);
+        if (err)
+                return err;
+
+        update_pkey_index(dev, slave, inbox);
+        update_gid(dev, inbox, (u8)slave);
+        adjust_proxy_tun_qkey(dev, vhcr, qpc);
+
+        return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
+}
+
+int mlx4_RTR2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd)
+{
+        int err;
+        struct mlx4_qp_context *context = inbox->buf + 8;
+
+        err = verify_qp_parameters(dev, inbox, QP_TRANS_RTR2RTS, slave);
+        if (err)
+                return err;
+
+        update_pkey_index(dev, slave, inbox);
+        update_gid(dev, inbox, (u8)slave);
+        adjust_proxy_tun_qkey(dev, vhcr, context);
+        return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
+}
+
+int mlx4_RTS2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd)
+{
+        int err;
+        struct mlx4_qp_context *context = inbox->buf + 8;
+
+        err = verify_qp_parameters(dev, inbox, QP_TRANS_RTS2RTS, slave);
+        if (err)
+                return err;
+
+        update_pkey_index(dev, slave, inbox);
+        update_gid(dev, inbox, (u8)slave);
+        adjust_proxy_tun_qkey(dev, vhcr, context);
+        return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
+}
+
+
+int mlx4_SQERR2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
+                              struct mlx4_vhcr *vhcr,
+                              struct mlx4_cmd_mailbox *inbox,
+                              struct mlx4_cmd_mailbox *outbox,
+                              struct mlx4_cmd_info *cmd)
+{
+        struct mlx4_qp_context *context = inbox->buf + 8;
+        adjust_proxy_tun_qkey(dev, vhcr, context);
+        return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
+}
+
+int mlx4_SQD2SQD_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd)
+{
+        int err;
+        struct mlx4_qp_context *context = inbox->buf + 8;
+
+        err = verify_qp_parameters(dev, inbox, QP_TRANS_SQD2SQD, slave);
+        if (err)
+                return err;
+
+        adjust_proxy_tun_qkey(dev, vhcr, context);
+        update_gid(dev, inbox, (u8)slave);
+        update_pkey_index(dev, slave, inbox);
+        return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
+}
+
+int mlx4_SQD2RTS_QP_wrapper(struct mlx4_dev *dev, int slave,
+                            struct mlx4_vhcr *vhcr,
+                            struct mlx4_cmd_mailbox *inbox,
+                            struct mlx4_cmd_mailbox *outbox,
+                            struct mlx4_cmd_info *cmd)
+{
+        int err;
+        struct mlx4_qp_context *context = inbox->buf + 8;
+
+        err = verify_qp_parameters(dev, inbox, QP_TRANS_SQD2RTS, slave);
+        if (err)
+                return err;
 
+        adjust_proxy_tun_qkey(dev, vhcr, context);
+        update_gid(dev, inbox, (u8)slave);
+        update_pkey_index(dev, slave, inbox);
         return mlx4_GEN_QP_wrapper(dev, slave, vhcr, inbox, outbox, cmd);
 }