summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Morgenstein <jackm@mellanox.co.il>2006-03-26 17:01:12 +0200
committerRoland Dreier <rolandd@cisco.com>2006-03-29 09:36:46 -0800
commita07bacca7b4032dd361ad5c87b1c39ae229e6739 (patch)
tree1050a1f6a00ca18cb1dc188a0af26b4cdd699ce3
parent3f89f834497c0f37f16a3b6c32b1d60782facbca (diff)
downloadlinux-a07bacca7b4032dd361ad5c87b1c39ae229e6739.tar.gz
linux-a07bacca7b4032dd361ad5c87b1c39ae229e6739.tar.bz2
linux-a07bacca7b4032dd361ad5c87b1c39ae229e6739.zip
IB/mthca: Fix check of size in SRQ creation
The previous patch for Tavor broke MemFree logic. The driver should perform limit check only for Tavor. For MemFree, the check is incorrect, since ds (WQE stride) is always a power-of-2 (although the max_desc_size may not be). In Tavor, however, WQE stride and desc_size are the same, and are not necessarily power-of-2. The check was really for the WQE stride (and it Tavor, we use max_desc_size for the stride). Signed-off-by: Jack Morgenstein <jackm@mellanox.co.il> Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/hw/mthca/mthca_srq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index 0cfd15802217..e74751ef913c 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -206,7 +206,7 @@ int mthca_alloc_srq(struct mthca_dev *dev, struct mthca_pd *pd,
roundup_pow_of_two(sizeof (struct mthca_next_seg) +
srq->max_gs * sizeof (struct mthca_data_seg)));
- if (ds > dev->limits.max_desc_sz)
+ if (!mthca_is_memfree(dev) && (ds > dev->limits.max_desc_sz))
return -EINVAL;
srq->wqe_shift = long_log2(ds);