Commit 46b010d3 authored by Mark F. Brown's avatar Mark F. Brown Committed by Greg Kroah-Hartman

staging/rdma/hfi1: Workaround to prevent corruption during packet delivery

Disabling one receive context when RX_DMA is receiving a packet can cause
incorrect packet delivery for a subsequent packet on another receive
context.

This is resolved by doing the following:
1. Programming dummy tail address for every receive context
   before enabling it
2. While deallocating receive context resetting tail address
   to dummy address
3. Leaving the dummy address in when disabling tail update
4. When disabling receive context leaving tail update enabled
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: default avatarMitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: default avatarMark F. Brown <mark.f.brown@intel.com>
Signed-off-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d7b8ba51
...@@ -7785,6 +7785,17 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, int ctxt) ...@@ -7785,6 +7785,17 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, int ctxt)
} }
if (op & HFI1_RCVCTRL_CTXT_DIS) { if (op & HFI1_RCVCTRL_CTXT_DIS) {
write_csr(dd, RCV_VL15, 0); write_csr(dd, RCV_VL15, 0);
/*
* When receive context is being disabled turn on tail
* update with a dummy tail address and then disable
* receive context.
*/
if (dd->rcvhdrtail_dummy_physaddr) {
write_kctxt_csr(dd, ctxt, RCV_HDR_TAIL_ADDR,
dd->rcvhdrtail_dummy_physaddr);
rcvctrl |= RCV_CTXT_CTRL_TAIL_UPD_SMASK;
}
rcvctrl &= ~RCV_CTXT_CTRL_ENABLE_SMASK; rcvctrl &= ~RCV_CTXT_CTRL_ENABLE_SMASK;
} }
if (op & HFI1_RCVCTRL_INTRAVAIL_ENB) if (op & HFI1_RCVCTRL_INTRAVAIL_ENB)
...@@ -7854,10 +7865,11 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, int ctxt) ...@@ -7854,10 +7865,11 @@ void hfi1_rcvctrl(struct hfi1_devdata *dd, unsigned int op, int ctxt)
if (op & (HFI1_RCVCTRL_TAILUPD_DIS | HFI1_RCVCTRL_CTXT_DIS)) if (op & (HFI1_RCVCTRL_TAILUPD_DIS | HFI1_RCVCTRL_CTXT_DIS))
/* /*
* If the context has been disabled and the Tail Update has * If the context has been disabled and the Tail Update has
* been cleared, clear the RCV_HDR_TAIL_ADDR CSR so * been cleared, set the RCV_HDR_TAIL_ADDR CSR to dummy address
* it doesn't contain an address that is invalid. * so it doesn't contain an address that is invalid.
*/ */
write_kctxt_csr(dd, ctxt, RCV_HDR_TAIL_ADDR, 0); write_kctxt_csr(dd, ctxt, RCV_HDR_TAIL_ADDR,
dd->rcvhdrtail_dummy_physaddr);
} }
u32 hfi1_read_cntrs(struct hfi1_devdata *dd, loff_t pos, char **namep, u32 hfi1_read_cntrs(struct hfi1_devdata *dd, loff_t pos, char **namep,
......
...@@ -1071,6 +1071,10 @@ struct hfi1_devdata { ...@@ -1071,6 +1071,10 @@ struct hfi1_devdata {
/* Save the enabled LCB error bits */ /* Save the enabled LCB error bits */
u64 lcb_err_en; u64 lcb_err_en;
u8 dc_shutdown; u8 dc_shutdown;
/* receive context tail dummy address */
__le64 *rcvhdrtail_dummy_kvaddr;
dma_addr_t rcvhdrtail_dummy_physaddr;
}; };
/* 8051 firmware version helper */ /* 8051 firmware version helper */
......
...@@ -692,6 +692,18 @@ int hfi1_init(struct hfi1_devdata *dd, int reinit) ...@@ -692,6 +692,18 @@ int hfi1_init(struct hfi1_devdata *dd, int reinit)
if (ret) if (ret)
goto done; goto done;
/* allocate dummy tail memory for all receive contexts */
dd->rcvhdrtail_dummy_kvaddr = dma_zalloc_coherent(
&dd->pcidev->dev, sizeof(u64),
&dd->rcvhdrtail_dummy_physaddr,
GFP_KERNEL);
if (!dd->rcvhdrtail_dummy_kvaddr) {
dd_dev_err(dd, "cannot allocate dummy tail memory\n");
ret = -ENOMEM;
goto done;
}
/* dd->rcd can be NULL if early initialization failed */ /* dd->rcd can be NULL if early initialization failed */
for (i = 0; dd->rcd && i < dd->first_user_ctxt; ++i) { for (i = 0; dd->rcd && i < dd->first_user_ctxt; ++i) {
/* /*
...@@ -1267,6 +1279,14 @@ static void cleanup_device_data(struct hfi1_devdata *dd) ...@@ -1267,6 +1279,14 @@ static void cleanup_device_data(struct hfi1_devdata *dd)
tmp = dd->rcd; tmp = dd->rcd;
dd->rcd = NULL; dd->rcd = NULL;
spin_unlock_irqrestore(&dd->uctxt_lock, flags); spin_unlock_irqrestore(&dd->uctxt_lock, flags);
if (dd->rcvhdrtail_dummy_kvaddr) {
dma_free_coherent(&dd->pcidev->dev, sizeof(u64),
(void *)dd->rcvhdrtail_dummy_kvaddr,
dd->rcvhdrtail_dummy_physaddr);
dd->rcvhdrtail_dummy_kvaddr = NULL;
}
for (ctxt = 0; tmp && ctxt < dd->num_rcv_contexts; ctxt++) { for (ctxt = 0; tmp && ctxt < dd->num_rcv_contexts; ctxt++) {
struct hfi1_ctxtdata *rcd = tmp[ctxt]; struct hfi1_ctxtdata *rcd = tmp[ctxt];
...@@ -1522,6 +1542,14 @@ int hfi1_create_rcvhdrq(struct hfi1_devdata *dd, struct hfi1_ctxtdata *rcd) ...@@ -1522,6 +1542,14 @@ int hfi1_create_rcvhdrq(struct hfi1_devdata *dd, struct hfi1_ctxtdata *rcd)
reg = (dd->rcvhdrsize & RCV_HDR_SIZE_HDR_SIZE_MASK) reg = (dd->rcvhdrsize & RCV_HDR_SIZE_HDR_SIZE_MASK)
<< RCV_HDR_SIZE_HDR_SIZE_SHIFT; << RCV_HDR_SIZE_HDR_SIZE_SHIFT;
write_kctxt_csr(dd, rcd->ctxt, RCV_HDR_SIZE, reg); write_kctxt_csr(dd, rcd->ctxt, RCV_HDR_SIZE, reg);
/*
* Program dummy tail address for every receive context
* before enabling any receive context
*/
write_kctxt_csr(dd, rcd->ctxt, RCV_HDR_TAIL_ADDR,
dd->rcvhdrtail_dummy_physaddr);
return 0; return 0;
bail_free: bail_free:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment