diff options
Diffstat (limited to 'drivers/infiniband/hw/cxgb3/cxio_hal.c')
-rw-r--r-- | drivers/infiniband/hw/cxgb3/cxio_hal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c index 35f286f1ad1e..005b7b52bc1e 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_hal.c +++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c | |||
@@ -174,7 +174,7 @@ int cxio_create_cq(struct cxio_rdev *rdev_p, struct t3_cq *cq, int kernel) | |||
174 | kfree(cq->sw_queue); | 174 | kfree(cq->sw_queue); |
175 | return -ENOMEM; | 175 | return -ENOMEM; |
176 | } | 176 | } |
177 | pci_unmap_addr_set(cq, mapping, cq->dma_addr); | 177 | dma_unmap_addr_set(cq, mapping, cq->dma_addr); |
178 | memset(cq->queue, 0, size); | 178 | memset(cq->queue, 0, size); |
179 | setup.id = cq->cqid; | 179 | setup.id = cq->cqid; |
180 | setup.base_addr = (u64) (cq->dma_addr); | 180 | setup.base_addr = (u64) (cq->dma_addr); |
@@ -297,7 +297,7 @@ int cxio_create_qp(struct cxio_rdev *rdev_p, u32 kernel_domain, | |||
297 | goto err4; | 297 | goto err4; |
298 | 298 | ||
299 | memset(wq->queue, 0, depth * sizeof(union t3_wr)); | 299 | memset(wq->queue, 0, depth * sizeof(union t3_wr)); |
300 | pci_unmap_addr_set(wq, mapping, wq->dma_addr); | 300 | dma_unmap_addr_set(wq, mapping, wq->dma_addr); |
301 | wq->doorbell = (void __iomem *)rdev_p->rnic_info.kdb_addr; | 301 | wq->doorbell = (void __iomem *)rdev_p->rnic_info.kdb_addr; |
302 | if (!kernel_domain) | 302 | if (!kernel_domain) |
303 | wq->udb = (u64)rdev_p->rnic_info.udbell_physbase + | 303 | wq->udb = (u64)rdev_p->rnic_info.udbell_physbase + |
@@ -325,7 +325,7 @@ int cxio_destroy_cq(struct cxio_rdev *rdev_p, struct t3_cq *cq) | |||
325 | dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), | 325 | dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), |
326 | (1UL << (cq->size_log2)) | 326 | (1UL << (cq->size_log2)) |
327 | * sizeof(struct t3_cqe), cq->queue, | 327 | * sizeof(struct t3_cqe), cq->queue, |
328 | pci_unmap_addr(cq, mapping)); | 328 | dma_unmap_addr(cq, mapping)); |
329 | cxio_hal_put_cqid(rdev_p->rscp, cq->cqid); | 329 | cxio_hal_put_cqid(rdev_p->rscp, cq->cqid); |
330 | return err; | 330 | return err; |
331 | } | 331 | } |
@@ -336,7 +336,7 @@ int cxio_destroy_qp(struct cxio_rdev *rdev_p, struct t3_wq *wq, | |||
336 | dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), | 336 | dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), |
337 | (1UL << (wq->size_log2)) | 337 | (1UL << (wq->size_log2)) |
338 | * sizeof(union t3_wr), wq->queue, | 338 | * sizeof(union t3_wr), wq->queue, |
339 | pci_unmap_addr(wq, mapping)); | 339 | dma_unmap_addr(wq, mapping)); |
340 | kfree(wq->sq); | 340 | kfree(wq->sq); |
341 | cxio_hal_rqtpool_free(rdev_p, wq->rq_addr, (1UL << wq->rq_size_log2)); | 341 | cxio_hal_rqtpool_free(rdev_p, wq->rq_addr, (1UL << wq->rq_size_log2)); |
342 | kfree(wq->rq); | 342 | kfree(wq->rq); |
@@ -537,7 +537,7 @@ static int cxio_hal_init_ctrl_qp(struct cxio_rdev *rdev_p) | |||
537 | err = -ENOMEM; | 537 | err = -ENOMEM; |
538 | goto err; | 538 | goto err; |
539 | } | 539 | } |
540 | pci_unmap_addr_set(&rdev_p->ctrl_qp, mapping, | 540 | dma_unmap_addr_set(&rdev_p->ctrl_qp, mapping, |
541 | rdev_p->ctrl_qp.dma_addr); | 541 | rdev_p->ctrl_qp.dma_addr); |
542 | rdev_p->ctrl_qp.doorbell = (void __iomem *)rdev_p->rnic_info.kdb_addr; | 542 | rdev_p->ctrl_qp.doorbell = (void __iomem *)rdev_p->rnic_info.kdb_addr; |
543 | memset(rdev_p->ctrl_qp.workq, 0, | 543 | memset(rdev_p->ctrl_qp.workq, 0, |
@@ -583,7 +583,7 @@ static int cxio_hal_destroy_ctrl_qp(struct cxio_rdev *rdev_p) | |||
583 | dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), | 583 | dma_free_coherent(&(rdev_p->rnic_info.pdev->dev), |
584 | (1UL << T3_CTRL_QP_SIZE_LOG2) | 584 | (1UL << T3_CTRL_QP_SIZE_LOG2) |
585 | * sizeof(union t3_wr), rdev_p->ctrl_qp.workq, | 585 | * sizeof(union t3_wr), rdev_p->ctrl_qp.workq, |
586 | pci_unmap_addr(&rdev_p->ctrl_qp, mapping)); | 586 | dma_unmap_addr(&rdev_p->ctrl_qp, mapping)); |
587 | return cxio_hal_clear_qp_ctx(rdev_p, T3_CTRL_QP_ID); | 587 | return cxio_hal_clear_qp_ctx(rdev_p, T3_CTRL_QP_ID); |
588 | } | 588 | } |
589 | 589 | ||