Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

Pull InfiniBand/RDMA changes for the 3.4 merge window from Roland Dreier:
 "Nothing big really stands out; by patch count lots of fixes to the
  mlx4 driver plus some cleanups and fixes to the core and other
  drivers."

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (28 commits)
  mlx4_core: Scale size of MTT table with system RAM
  mlx4_core: Allow dynamic MTU configuration for IB ports
  IB/mlx4: Fix info returned when querying IBoE ports
  IB/mlx4: Fix possible missed completion event
  mlx4_core: Report thermal error events
  mlx4_core: Fix one more static exported function
  IB: Change CQE "csum_ok" field to a bit flag
  RDMA/iwcm: Reject connect requests if cmid is not in LISTEN state
  RDMA/cxgb3: Don't pass irq flags to flush_qp()
  mlx4_core: Get rid of redundant ext_port_cap flags
  RDMA/ucma: Fix AB-BA deadlock
  IB/ehca: Fix ilog2() compile failure
  IB: Use central enum for speed instead of hard-coded values
  IB/iser: Post initial receive buffers before sending the final login request
  IB/iser: Free IB connection resources in the proper place
  IB/srp: Consolidate repetitive sysfs code
  IB/srp: Use pr_fmt() and pr_err()/pr_warn()
  IB/core: Fix SDR rates in sysfs
  mlx4: Enforce device max FMR maps in FMR alloc
  IB/mlx4: Set bad_wr for invalid send opcode
  ...

1 files changed, 22 insertions, 46 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 98e776261ead..77535ff18f1b 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -590,49 +590,6 @@ int mlx4_get_port_ib_caps(struct mlx4_dev *dev, u8 port, __be32 *caps)
         return err;
 }
 
-int mlx4_check_ext_port_caps(struct mlx4_dev *dev, u8 port)
-{
-        struct mlx4_cmd_mailbox *inmailbox, *outmailbox;
-        u8 *inbuf, *outbuf;
-        int err, packet_error;
-
-        inmailbox = mlx4_alloc_cmd_mailbox(dev);
-        if (IS_ERR(inmailbox))
-                return PTR_ERR(inmailbox);
-
-        outmailbox = mlx4_alloc_cmd_mailbox(dev);
-        if (IS_ERR(outmailbox)) {
-                mlx4_free_cmd_mailbox(dev, inmailbox);
-                return PTR_ERR(outmailbox);
-        }
-
-        inbuf = inmailbox->buf;
-        outbuf = outmailbox->buf;
-        memset(inbuf, 0, 256);
-        memset(outbuf, 0, 256);
-        inbuf[0] = 1;
-        inbuf[1] = 1;
-        inbuf[2] = 1;
-        inbuf[3] = 1;
-
-        *(__be16 *) (&inbuf[16]) = MLX4_ATTR_EXTENDED_PORT_INFO;
-        *(__be32 *) (&inbuf[20]) = cpu_to_be32(port);
-
-        err = mlx4_cmd_box(dev, inmailbox->dma, outmailbox->dma, port, 3,
-                           MLX4_CMD_MAD_IFC, MLX4_CMD_TIME_CLASS_C,
-                           MLX4_CMD_NATIVE);
-
-        packet_error = be16_to_cpu(*(__be16 *) (outbuf + 4));
-
-        dev->caps.ext_port_cap[port] = (!err && !packet_error) ?
-                                       MLX_EXT_PORT_CAP_FLAG_EXTENDED_PORT_INFO
-                                       : 0;
-
-        mlx4_free_cmd_mailbox(dev, inmailbox);
-        mlx4_free_cmd_mailbox(dev, outmailbox);
-        return err;
-}
-
 static int mlx4_common_set_port(struct mlx4_dev *dev, int slave, u32 in_mod,
                                 u8 op_mod, struct mlx4_cmd_mailbox *inbox)
 {
@@ -766,10 +723,18 @@ int mlx4_SET_PORT_wrapper(struct mlx4_dev *dev, int slave,
                                     vhcr->op_modifier, inbox);
 }
 
+/* bit locations for set port command with zero op modifier */
+enum {
+        MLX4_SET_PORT_VL_CAP     = 4, /* bits 7:4 */
+        MLX4_SET_PORT_MTU_CAP    = 12, /* bits 15:12 */
+        MLX4_CHANGE_PORT_VL_CAP  = 21,
+        MLX4_CHANGE_PORT_MTU_CAP = 22,
+};
+
 int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
 {
         struct mlx4_cmd_mailbox *mailbox;
-        int err;
+        int err, vl_cap;
 
         if (dev->caps.port_type[port] == MLX4_PORT_TYPE_ETH)
                 return 0;
@@ -781,8 +746,19 @@ int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
         memset(mailbox->buf, 0, 256);
 
         ((__be32 *) mailbox->buf)[1] = dev->caps.ib_port_def_cap[port];
-        err = mlx4_cmd(dev, mailbox->dma, port, 0, MLX4_CMD_SET_PORT,
-                       MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);
+
+        /* IB VL CAP enum isn't used by the firmware, just numerical values */
+        for (vl_cap = 8; vl_cap >= 1; vl_cap >>= 1) {
+                ((__be32 *) mailbox->buf)[0] = cpu_to_be32(
+                        (1 << MLX4_CHANGE_PORT_MTU_CAP) |
+                        (1 << MLX4_CHANGE_PORT_VL_CAP)  |
+                        (dev->caps.port_ib_mtu[port] << MLX4_SET_PORT_MTU_CAP) |
+                        (vl_cap << MLX4_SET_PORT_VL_CAP));
+                err = mlx4_cmd(dev, mailbox->dma, port, 0, MLX4_CMD_SET_PORT,
+                                MLX4_CMD_TIME_CLASS_B, MLX4_CMD_WRAPPED);
+                if (err != -ENOMEM)
+                        break;
+        }
 
         mlx4_free_cmd_mailbox(dev, mailbox);
         return err;