diff options
| author | Joachim Fenkes <fenkes@de.ibm.com> | 2007-10-16 17:26:54 +0200 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-10-17 21:46:37 -0700 |
| commit | 8c08d50d4fc52a9367c356ebbeb194c30fbc7ac8 (patch) | |
| tree | eb1f102cd3a99b3f91b8923996a24f42e165543c /drivers/infiniband/hw/ehca | |
| parent | 9511724da9c090da5a6dcf6c557b1cedc4f5cfd7 (diff) | |
| download | linux-8c08d50d4fc52a9367c356ebbeb194c30fbc7ac8.tar.gz linux-8c08d50d4fc52a9367c356ebbeb194c30fbc7ac8.tar.bz2 linux-8c08d50d4fc52a9367c356ebbeb194c30fbc7ac8.zip | |
IB/ehca: Fix ehca_encode_hwpage_size() and alloc_fmr()
Simplify ehca_encode_hwpage_size(), fixing an infinite loop for pgsize == 0
in the process. Fix the bug in alloc_fmr() that triggered the loop.
Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ehca')
| -rw-r--r-- | drivers/infiniband/hw/ehca/ehca_mrmw.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c index 16c9efd8eeac..b9a788c4fdd1 100644 --- a/drivers/infiniband/hw/ehca/ehca_mrmw.c +++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c @@ -72,17 +72,9 @@ enum ehca_mr_pgsize { static u32 ehca_encode_hwpage_size(u32 pgsize) { - u32 idx = 0; - pgsize >>= 12; - /* - * map mr page size into hw code: - * 0, 1, 2, 3 for 4K, 64K, 1M, 64M - */ - while (!(pgsize & 1)) { - idx++; - pgsize >>= 4; - } - return idx; + int log = ilog2(pgsize); + WARN_ON(log < 12 || log > 24 || log & 3); + return (log - 12) / 4; } static u64 ehca_get_max_hwpage_size(struct ehca_shca *shca) @@ -826,6 +818,7 @@ struct ib_fmr *ehca_alloc_fmr(struct ib_pd *pd, /* register MR on HCA */ memset(&pginfo, 0, sizeof(pginfo)); + pginfo.hwpage_size = hw_pgsize; /* * pginfo.num_hwpages==0, ie register_rpages() will not be called * but deferred to map_phys_fmr() |