3 files changed, 9 insertions, 10 deletions

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 68580cb2ae1e..f75080d63142 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -6841,7 +6841,7 @@ static void rxe_kernel_unfreeze(struct hfi1_devdata *dd)
                 }
                 rcvmask = HFI1_RCVCTRL_CTXT_ENB;
                 /* HFI1_RCVCTRL_TAILUPD_[ENB|DIS] needs to be set explicitly */
-                rcvmask |= HFI1_CAP_KGET_MASK(rcd->flags, DMA_RTAIL) ?
+                rcvmask |= rcd->rcvhdrtail_kvaddr ?
                         HFI1_RCVCTRL_TAILUPD_ENB : HFI1_RCVCTRL_TAILUPD_DIS;
                 hfi1_rcvctrl(dd, rcvmask, rcd);
                 hfi1_rcd_put(rcd);
@@ -8367,7 +8367,7 @@ static inline int check_packet_present(struct hfi1_ctxtdata *rcd)
         u32 tail;
         int present;
 
-        if (!HFI1_CAP_IS_KSET(DMA_RTAIL))
+        if (!rcd->rcvhdrtail_kvaddr)
                 present = (rcd->seq_cnt ==
                                 rhf_rcv_seq(rhf_to_cpu(get_rhf_addr(rcd))));
         else /* is RDMA rtail */
@@ -11843,7 +11843,7 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op,
                 /* reset the tail and hdr addresses, and sequence count */
                 write_kctxt_csr(dd, ctxt, RCV_HDR_ADDR,
                                 rcd->rcvhdrq_dma);
-                if (HFI1_CAP_KGET_MASK(rcd->flags, DMA_RTAIL))
+                if (rcd->rcvhdrtail_kvaddr)
                         write_kctxt_csr(dd, ctxt, RCV_HDR_TAIL_ADDR,
                                         rcd->rcvhdrqtailaddr_dma);
                 rcd->seq_cnt = 1;
@@ -11923,7 +11923,7 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op,
                 rcvctrl |= RCV_CTXT_CTRL_INTR_AVAIL_SMASK;
         if (op & HFI1_RCVCTRL_INTRAVAIL_DIS)
                 rcvctrl &= ~RCV_CTXT_CTRL_INTR_AVAIL_SMASK;
-        if (op & HFI1_RCVCTRL_TAILUPD_ENB && rcd->rcvhdrqtailaddr_dma)
+        if ((op & HFI1_RCVCTRL_TAILUPD_ENB) && rcd->rcvhdrtail_kvaddr)
                 rcvctrl |= RCV_CTXT_CTRL_TAIL_UPD_SMASK;
         if (op & HFI1_RCVCTRL_TAILUPD_DIS) {
                 /* See comment on RcvCtxtCtrl.TailUpd above */
diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index c9d23c37a371..0fc4aa9455c3 100644
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -505,7 +505,7 @@ static int hfi1_file_mmap(struct file *fp, struct vm_area_struct *vma)
                         ret = -EINVAL;
                         goto done;
                 }
-                if (flags & VM_WRITE) {
+                if ((flags & VM_WRITE) || !uctxt->rcvhdrtail_kvaddr) {
                         ret = -EPERM;
                         goto done;
                 }
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 3feecf926322..4a478ee0a79b 100644
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -1853,7 +1853,6 @@ int hfi1_create_rcvhdrq(struct hfi1_devdata *dd, struct hfi1_ctxtdata *rcd)
         u64 reg;
 
         if (!rcd->rcvhdrq) {
-                dma_addr_t dma_hdrqtail;
                 gfp_t gfp_flags;
 
                 /*
@@ -1878,13 +1877,13 @@ int hfi1_create_rcvhdrq(struct hfi1_devdata *dd, struct hfi1_ctxtdata *rcd)
                         goto bail;
                 }
 
-                if (HFI1_CAP_KGET_MASK(rcd->flags, DMA_RTAIL)) {
+                if (HFI1_CAP_KGET_MASK(rcd->flags, DMA_RTAIL) ||
+                    HFI1_CAP_UGET_MASK(rcd->flags, DMA_RTAIL)) {
                         rcd->rcvhdrtail_kvaddr = dma_zalloc_coherent(
-                                &dd->pcidev->dev, PAGE_SIZE, &dma_hdrqtail,
-                                gfp_flags);
+                                &dd->pcidev->dev, PAGE_SIZE,
+                                &rcd->rcvhdrqtailaddr_dma, gfp_flags);
                         if (!rcd->rcvhdrtail_kvaddr)
                                 goto bail_free;
-                        rcd->rcvhdrqtailaddr_dma = dma_hdrqtail;
                 }
 
                 rcd->rcvhdrq_size = amt;