lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

IB/mthca: correct log2 calculation

Browse Source 
Fix thinko in rd_atomic calculation: ffs(x) - 1 does not find the next
power of 2 -- it should be fls(x - 1).

Signed-off-by: Jack Morgenstein <jackm@mellanox.co.il>
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Jack Morgenstein
2005-12-09 16:38:04 -08:00
committed by Roland Dreier
parent 94361cf74a
commit 6aa2e4e806
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/infiniband/hw/mthca/mthca_qp.c
View File

@@ -728,9 +728,9 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
} }
if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC) { if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC) {
qp_context->params1 |= cpu_to_be32(min(attr->max_rd_atomic ? if (attr->max_rd_atomic)
ffs(attr->max_rd_atomic) - 1 : 0, qp_context->params1 |=
7) << 21); cpu_to_be32(fls(attr->max_rd_atomic - 1) << 21);
qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_SRA_MAX); qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_SRA_MAX);
} }
@@ -769,8 +769,6 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
} }
if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC) { if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC) {
u8 rra_max;
if (qp->resp_depth && !attr->max_dest_rd_atomic) { if (qp->resp_depth && !attr->max_dest_rd_atomic) {
/* /*
* Lowering our responder resources to zero. * Lowering our responder resources to zero.
@@ -798,13 +796,10 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
MTHCA_QP_OPTPAR_RAE); MTHCA_QP_OPTPAR_RAE);
} }
for (rra_max = 0; if (attr->max_dest_rd_atomic)
1 << rra_max < attr->max_dest_rd_atomic && qp_context->params2 |=
rra_max < dev->qp_table.rdb_shift; cpu_to_be32(fls(attr->max_dest_rd_atomic - 1) << 21);
++rra_max)
; /* nothing */
qp_context->params2 |= cpu_to_be32(rra_max << 21);
qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_RRA_MAX); qp_param->opt_param_mask |= cpu_to_be32(MTHCA_QP_OPTPAR_RRA_MAX);
qp->resp_depth = attr->max_dest_rd_atomic; qp->resp_depth = attr->max_dest_rd_atomic;