diff options
| author | Doug Ledford <dledford@redhat.com> | 2019-02-09 20:54:04 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2019-02-09 20:54:04 +0300 |
| commit | 82771f20338fcdeb0a38319c7a72f1f36df39a7a (patch) | |
| tree | 532f865fff8bb8e17ec5b743c57bd5c5ec07fd2e /drivers/infiniband/hw/hfi1/vnic_sdma.c | |
| parent | ecb53febfcad565366762b7413b03452874643db (diff) | |
| parent | 416fbc1bbaa51742f7c49ff0578a594c2082c73b (diff) | |
| download | linux-82771f20338fcdeb0a38319c7a72f1f36df39a7a.tar.xz | |
Merge branch 'wip/dl-for-next' into for-next
Due to concurrent work by myself and Jason, a normal fast forward merge
was not possible. This brings in a number of hfi1 changes, mainly the
hfi1 TID RDMA support (roughly 10,000 LOC change), which was reviewed
and integrated over a period of days.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/hfi1/vnic_sdma.c')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/vnic_sdma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/hfi1/vnic_sdma.c b/drivers/infiniband/hw/hfi1/vnic_sdma.c index 1f81c480e028..af1b1ffcb38e 100644 --- a/drivers/infiniband/hw/hfi1/vnic_sdma.c +++ b/drivers/infiniband/hw/hfi1/vnic_sdma.c @@ -240,8 +240,10 @@ static int hfi1_vnic_sdma_sleep(struct sdma_engine *sde, } vnic_sdma->state = HFI1_VNIC_SDMA_Q_DEFERRED; - if (list_empty(&vnic_sdma->wait.list)) + if (list_empty(&vnic_sdma->wait.list)) { + iowait_get_priority(wait->iow); iowait_queue(pkts_sent, wait->iow, &sde->dmawait); + } write_sequnlock(&sde->waitlock); return -EBUSY; } @@ -281,7 +283,7 @@ void hfi1_vnic_sdma_init(struct hfi1_vnic_vport_info *vinfo) iowait_init(&vnic_sdma->wait, 0, NULL, NULL, hfi1_vnic_sdma_sleep, - hfi1_vnic_sdma_wakeup, NULL); + hfi1_vnic_sdma_wakeup, NULL, NULL); vnic_sdma->sde = &vinfo->dd->per_sdma[i]; vnic_sdma->dd = vinfo->dd; vnic_sdma->vinfo = vinfo; |