diff mbox

IB/hfi1: Support ib_alloc_mr verb

Message ID 20150807145125.27568.22379.stgit@phlsvslse11.ph.intel.com (mailing list archive)
State Accepted
Headers show

Commit Message

Marciniszyn, Mike Aug. 7, 2015, 2:51 p.m. UTC 
Ported from upstream qib commit
68c02e232b8a ("qib: Support ib_alloc_mr verb")

Tested-by: Jubin John <jubin.john@intel.com>
Reviewed-by: Jubin John <jubin.john@intel.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
---
 drivers/staging/hfi1/mr.c    |    9 +++++++--
 drivers/staging/hfi1/verbs.c |    1 +
 drivers/staging/hfi1/verbs.h |    4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Doug Ledford Aug. 15, 2015, 1:31 a.m. UTC | #1 
On 08/07/2015 10:51 AM, Mike Marciniszyn wrote:
> Ported from upstream qib commit
> 68c02e232b8a ("qib: Support ib_alloc_mr verb")
> 
> Tested-by: Jubin John <jubin.john@intel.com>
> Reviewed-by: Jubin John <jubin.john@intel.com>
> Signed-off-by: Mike Marciniszyn <mike.marciniszyn@intel.com>

Added to the hfi1 branch.
diff mbox

Patch

diff --git a/drivers/staging/hfi1/mr.c b/drivers/staging/hfi1/mr.c
index 23567f8..bd64e4f 100644
--- a/drivers/staging/hfi1/mr.c
+++ b/drivers/staging/hfi1/mr.c
@@ -348,11 +348,16 @@  out:
  *
  * Return the memory region on success, otherwise return an errno.
  */
-struct ib_mr *hfi1_alloc_fast_reg_mr(struct ib_pd *pd, int max_page_list_len)
+struct ib_mr *hfi1_alloc_mr(struct ib_pd *pd,
+			    enum ib_mr_type mr_type,
+			    u32 max_num_sg)
 {
 	struct hfi1_mr *mr;
 
-	mr = alloc_mr(max_page_list_len, pd);
+	if (mr_type != IB_MR_TYPE_MEM_REG)
+		return ERR_PTR(-EINVAL);
+
+	mr = alloc_mr(max_num_sg, pd);
 	if (IS_ERR(mr))
 		return (struct ib_mr *)mr;
 
diff --git a/drivers/staging/hfi1/verbs.c b/drivers/staging/hfi1/verbs.c
index 5f4b661..53ac214 100644
--- a/drivers/staging/hfi1/verbs.c
+++ b/drivers/staging/hfi1/verbs.c
@@ -2045,6 +2045,7 @@  int hfi1_register_ib_device(struct hfi1_devdata *dd)
 	ibdev->reg_phys_mr = hfi1_reg_phys_mr;
 	ibdev->reg_user_mr = hfi1_reg_user_mr;
 	ibdev->dereg_mr = hfi1_dereg_mr;
+	ibdev->alloc_mr = hfi1_alloc_mr;
 	ibdev->alloc_fast_reg_page_list = hfi1_alloc_fast_reg_page_list;
 	ibdev->free_fast_reg_page_list = hfi1_free_fast_reg_page_list;
 	ibdev->alloc_fmr = hfi1_alloc_fmr;
diff --git a/drivers/staging/hfi1/verbs.h b/drivers/staging/hfi1/verbs.h
index 8125361..ed903a9 100644
--- a/drivers/staging/hfi1/verbs.h
+++ b/drivers/staging/hfi1/verbs.h
@@ -1016,7 +1016,9 @@  struct ib_mr *hfi1_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
 
 int hfi1_dereg_mr(struct ib_mr *ibmr);
 
-struct ib_mr *hfi1_alloc_fast_reg_mr(struct ib_pd *pd, int max_page_list_len);
+struct ib_mr *hfi1_alloc_mr(struct ib_pd *pd,
+			    enum ib_mr_type mr_type,
+			    u32 max_entries);
 
 struct ib_fast_reg_page_list *hfi1_alloc_fast_reg_page_list(
 				struct ib_device *ibdev, int page_list_len);