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, 15 insertions, 12 deletions

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index c61bca30fd2d..83b720ef6c34 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -179,33 +179,36 @@ static ssize_t rate_show(struct ib_port *p, struct port_attribute *unused,
 {
         struct ib_port_attr attr;
         char *speed = "";
-        int rate;
+        int rate = -1;          /* in deci-Gb/sec */
         ssize_t ret;
 
         ret = ib_query_port(p->ibdev, p->port_num, &attr);
         if (ret)
                 return ret;
 
-        rate = (25 * attr.active_speed) / 10;
-
         switch (attr.active_speed) {
-        case 2:
+        case IB_SPEED_SDR:
+                rate = 25;
+                break;
+        case IB_SPEED_DDR:
                 speed = " DDR";
+                rate = 50;
                 break;
-        case 4:
+        case IB_SPEED_QDR:
                 speed = " QDR";
+                rate = 100;
                 break;
-        case 8:
+        case IB_SPEED_FDR10:
                 speed = " FDR10";
-                rate = 10;
+                rate = 100;
                 break;
-        case 16:
+        case IB_SPEED_FDR:
                 speed = " FDR";
-                rate = 14;
+                rate = 140;
                 break;
-        case 32:
+        case IB_SPEED_EDR:
                 speed = " EDR";
-                rate = 25;
+                rate = 250;
                 break;
         }
 
@@ -214,7 +217,7 @@ static ssize_t rate_show(struct ib_port *p, struct port_attribute *unused,
                 return -EINVAL;
 
         return sprintf(buf, "%d%s Gb/sec (%dX%s)\n",
-                       rate, (attr.active_speed == 1) ? ".5" : "",
+                       rate / 10, rate % 10 ? ".5" : "",
                        ib_width_enum_to_int(attr.active_width), speed);
 }