|
@@ -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 */
|