From 8eb93a6b04fd12e7bc2fed50ced6fc9e34038ede Mon Sep 17 00:00:00 2001 From: Or Gerlitz Date: Sat, 17 Jun 2006 20:37:37 -0700 Subject: [PATCH] --- yaml --- r: 27628 b: refs/heads/master c: d4cb0784fd1ea99ef3d20526811bd5608146fe60 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mthca/mthca_provider.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5991b46956ce..3f0a08e28d37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6eddb5cb906ac5c9a17a1b76464eadacd88b6c92 +refs/heads/master: d4cb0784fd1ea99ef3d20526811bd5608146fe60 diff --git a/trunk/drivers/infiniband/hw/mthca/mthca_provider.c b/trunk/drivers/infiniband/hw/mthca/mthca_provider.c index a2eae8a30167..8f89ba7c9147 100644 --- a/trunk/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/trunk/drivers/infiniband/hw/mthca/mthca_provider.c @@ -115,6 +115,16 @@ static int mthca_query_device(struct ib_device *ibdev, props->max_mcast_qp_attach = MTHCA_QP_PER_MGM; props->max_total_mcast_qp_attach = props->max_mcast_qp_attach * props->max_mcast_grp; + /* + * If Sinai memory key optimization is being used, then only + * the 8-bit key portion will change. For other HCAs, the + * unused index bits will also be used for FMR remapping. + */ + if (mdev->mthca_flags & MTHCA_FLAG_SINAI_OPT) + props->max_map_per_fmr = 255; + else + props->max_map_per_fmr = + (1 << (32 - long_log2(mdev->limits.num_mpts))) - 1; err = 0; out: