Skip to content

Commit

Permalink
IB/core: Fix SDR rates in sysfs
Browse files Browse the repository at this point in the history
Commit 71eeba1 ("IB: Add new InfiniBand link speeds") introduced a bug 
where eg the rate for IB 4X SDR links iss displayed as "8.5 Gb/sec" 
instead of "10 Gb/sec" as it used to be.  Fix that.

Reported-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
  • Loading branch information
Roland Dreier committed Feb 27, 2012
1 parent 6b21d18 commit e9319b0
Showing 1 changed file with 11 additions and 7 deletions.
18 changes: 11 additions & 7 deletions drivers/infiniband/core/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,33 +179,37 @@ 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 1:
/* SDR */
rate = 25;
break;
case 2:
speed = " DDR";
rate = 50;
break;
case 4:
speed = " QDR";
rate = 100;
break;
case 8:
speed = " FDR10";
rate = 10;
rate = 100;
break;
case 16:
speed = " FDR";
rate = 14;
rate = 140;
break;
case 32:
speed = " EDR";
rate = 25;
rate = 250;
break;
}

Expand All @@ -214,7 +218,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);
}

Expand Down

0 comments on commit e9319b0

Please sign in to comment.