IB/mlx4: Handle FW command interface rev 3

Upcoming firmware introduces command interface revision 3, which
changes the way port capabilities are queried and set.  Update the
driver to handle both the new and old command interfaces by adding a
new MLX4_FLAG_OLD_PORT_CMDS that it is set after querying the firmware
interface revision and then using the correct interface based on the
setting of the flag.

Signed-off-by: Roland Dreier <rolandd@cisco.com>

2 files changed, 26 insertions, 34 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 402f3a20ec0a..1095c82b38c2 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -125,7 +125,7 @@ static int mlx4_ib_query_device(struct ib_device *ibdev,
         props->local_ca_ack_delay  = dev->dev->caps.local_ca_ack_delay;
         props->atomic_cap          = dev->dev->caps.flags & MLX4_DEV_CAP_FLAG_ATOMIC ?
                 IB_ATOMIC_HCA : IB_ATOMIC_NONE;
-        props->max_pkeys           = dev->dev->caps.pkey_table_len;
+        props->max_pkeys           = dev->dev->caps.pkey_table_len[1];
         props->max_mcast_grp       = dev->dev->caps.num_mgms + dev->dev->caps.num_amgms;
         props->max_mcast_qp_attach = dev->dev->caps.num_qp_per_mgm;
         props->max_total_mcast_qp_attach = props->max_mcast_qp_attach *
@@ -168,9 +168,9 @@ static int mlx4_ib_query_port(struct ib_device *ibdev, u8 port,
         props->state            = out_mad->data[32] & 0xf;
         props->phys_state       = out_mad->data[33] >> 4;
         props->port_cap_flags   = be32_to_cpup((__be32 *) (out_mad->data + 20));
-        props->gid_tbl_len      = to_mdev(ibdev)->dev->caps.gid_table_len;
+        props->gid_tbl_len      = to_mdev(ibdev)->dev->caps.gid_table_len[port];
         props->max_msg_sz       = 0x80000000;
-        props->pkey_tbl_len     = to_mdev(ibdev)->dev->caps.pkey_table_len;
+        props->pkey_tbl_len     = to_mdev(ibdev)->dev->caps.pkey_table_len[port];
         props->bad_pkey_cntr    = be16_to_cpup((__be16 *) (out_mad->data + 46));
         props->qkey_viol_cntr   = be16_to_cpup((__be16 *) (out_mad->data + 48));
         props->active_width     = out_mad->data[31] & 0xf;
@@ -280,8 +280,14 @@ static int mlx4_SET_PORT(struct mlx4_ib_dev *dev, u8 port, int reset_qkey_viols,
                 return PTR_ERR(mailbox);
 
         memset(mailbox->buf, 0, 256);
-        *(u8 *) mailbox->buf         = !!reset_qkey_viols << 6;
-        ((__be32 *) mailbox->buf)[2] = cpu_to_be32(cap_mask);
+
+        if (dev->dev->flags & MLX4_FLAG_OLD_PORT_CMDS) {
+                *(u8 *) mailbox->buf         = !!reset_qkey_viols << 6;
+                ((__be32 *) mailbox->buf)[2] = cpu_to_be32(cap_mask);
+        } else {
+                ((u8 *) mailbox->buf)[3]     = !!reset_qkey_viols;
+                ((__be32 *) mailbox->buf)[1] = cpu_to_be32(cap_mask);
+        }
 
         err = mlx4_cmd(dev->dev, mailbox->dma, port, 0, MLX4_CMD_SET_PORT,
                        MLX4_CMD_TIME_CLASS_B);
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 95d4a9d6994c..355a31f9c03c 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -603,24 +603,6 @@ int mlx4_ib_destroy_qp(struct ib_qp *qp)
         return 0;
 }
 
-static void init_port(struct mlx4_ib_dev *dev, int port)
-{
-        struct mlx4_init_port_param param;
-        int err;
-
-        memset(&param, 0, sizeof param);
-
-        param.port_width_cap = dev->dev->caps.port_width_cap;
-        param.vl_cap         = dev->dev->caps.vl_cap;
-        param.mtu            = ib_mtu_enum_to_int(dev->dev->caps.mtu_cap);
-        param.max_gid        = dev->dev->caps.gid_table_len;
-        param.max_pkey       = dev->dev->caps.pkey_table_len;
-
-        err = mlx4_INIT_PORT(dev->dev, &param, port);
-        if (err)
-                printk(KERN_WARNING "INIT_PORT failed, return code %d.\n", err);
-}
-
 static int to_mlx4_st(enum ib_qp_type type)
 {
         switch (type) {
@@ -694,9 +676,9 @@ static int mlx4_set_path(struct mlx4_ib_dev *dev, const struct ib_ah_attr *ah,
         path->counter_index = 0xff;
 
         if (ah->ah_flags & IB_AH_GRH) {
-                if (ah->grh.sgid_index >= dev->dev->caps.gid_table_len) {
+                if (ah->grh.sgid_index >= dev->dev->caps.gid_table_len[port]) {
                         printk(KERN_ERR "sgid_index (%u) too large. max is %d\n",
-                               ah->grh.sgid_index, dev->dev->caps.gid_table_len - 1);
+                               ah->grh.sgid_index, dev->dev->caps.gid_table_len[port] - 1);
                         return -1;
                 }
 
@@ -812,13 +794,14 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
         }
 
         if (attr_mask & IB_QP_ALT_PATH) {
-                if (attr->alt_pkey_index >= dev->dev->caps.pkey_table_len)
-                        return -EINVAL;
-
                 if (attr->alt_port_num == 0 ||
                     attr->alt_port_num > dev->dev->caps.num_ports)
                         return -EINVAL;
 
+                if (attr->alt_pkey_index >=
+                    dev->dev->caps.pkey_table_len[attr->alt_port_num])
+                        return -EINVAL;
+
                 if (mlx4_set_path(dev, &attr->alt_ah_attr, &context->alt_path,
                                   attr->alt_port_num))
                         return -EINVAL;
@@ -949,7 +932,9 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
          */
         if (is_qp0(dev, qp)) {
                 if (cur_state != IB_QPS_RTR && new_state == IB_QPS_RTR)
-                        init_port(dev, qp->port);
+                        if (mlx4_INIT_PORT(dev->dev, qp->port))
+                                printk(KERN_WARNING "INIT_PORT failed for port %d\n",
+                                       qp->port);
 
                 if (cur_state != IB_QPS_RESET && cur_state != IB_QPS_ERR &&
                     (new_state == IB_QPS_RESET || new_state == IB_QPS_ERR))
@@ -1012,16 +997,17 @@ int mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask))
                 goto out;
 
-        if ((attr_mask & IB_QP_PKEY_INDEX) &&
-             attr->pkey_index >= dev->dev->caps.pkey_table_len) {
-                goto out;
-        }
-
         if ((attr_mask & IB_QP_PORT) &&
             (attr->port_num == 0 || attr->port_num > dev->dev->caps.num_ports)) {
                 goto out;
         }
 
+        if (attr_mask & IB_QP_PKEY_INDEX) {
+                int p = attr_mask & IB_QP_PORT ? attr->port_num : qp->port;
+                if (attr->pkey_index >= dev->dev->caps.pkey_table_len[p])
+                        goto out;
+        }
+
         if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
             attr->max_rd_atomic > dev->dev->caps.max_qp_init_rdma) {
                 goto out;