4 files changed, 7 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index e852a3a42b9e..dfa9df484505 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -657,7 +657,7 @@ static void build_rdma0_msg(struct nes_cm_node *cm_node, struct nes_qp **nesqp_a
         struct nes_qp *nesqp = *nesqp_addr;
         struct nes_hw_qp_wqe *wqe = &nesqp->hwqp.sq_vbase[0];
 
-        u64temp = (unsigned long)nesqp;
+        u64temp = (unsigned long)nesqp->nesuqp_addr;
         u64temp |= NES_SW_CONTEXT_ALIGN >> 1;
         set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_COMP_CTX_LOW_IDX, u64temp);
 
diff --git a/drivers/infiniband/hw/nes/nes_user.h b/drivers/infiniband/hw/nes/nes_user.h
index 4926de744488..529c421bb15c 100644
--- a/drivers/infiniband/hw/nes/nes_user.h
+++ b/drivers/infiniband/hw/nes/nes_user.h
@@ -39,8 +39,8 @@
 
 #include <linux/types.h>
 
-#define NES_ABI_USERSPACE_VER 1
-#define NES_ABI_KERNEL_VER    1
+#define NES_ABI_USERSPACE_VER 2
+#define NES_ABI_KERNEL_VER    2
 
 /*
  * Make sure that all structs defined in this file remain laid out so
@@ -78,6 +78,7 @@ struct nes_create_cq_req {
 
 struct nes_create_qp_req {
         __u64 user_wqe_buffers;
+        __u64 user_qp_buffer;
 };
 
 enum iwnes_memreg_type {
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 8308e3634767..797d8876d948 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -1191,6 +1191,8 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
                                 if (req.user_wqe_buffers) {
                                         virt_wqs = 1;
                                 }
+                                if (req.user_qp_buffer)
+                                        nesqp->nesuqp_addr = req.user_qp_buffer;
                                 if ((ibpd->uobject) && (ibpd->uobject->context)) {
                                         nesqp->user_mode = 1;
                                         nes_ucontext = to_nesucontext(ibpd->uobject->context);
diff --git a/drivers/infiniband/hw/nes/nes_verbs.h b/drivers/infiniband/hw/nes/nes_verbs.h
index 0eff7c44d76b..309b31c31ae1 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.h
+++ b/drivers/infiniband/hw/nes/nes_verbs.h
@@ -184,5 +184,6 @@ struct nes_qp {
         u8                    pau_busy;
         u8                    pau_pending;
         u8                    pau_state;
+        __u64                 nesuqp_addr;
 };
 #endif                  /* NES_VERBS_H */