RDMA/cxgb4: Use the DMA state API instead of the pci equivalents

[net-next-2.6.git] / drivers / infiniband / hw / cxgb4 / qp.c

diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 83a01dc0c4c1c91c66fe5aec6e64bd1a23923560..7065cb3105538f62cca0edcf8a2f951cddba210a 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -40,10 +40,10 @@ static int destroy_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
         */
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          wq->rq.memsize, wq->rq.queue,
-                         pci_unmap_addr(&wq->rq, mapping));
+                         dma_unmap_addr(&wq->rq, mapping));
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          wq->sq.memsize, wq->sq.queue,
-                         pci_unmap_addr(&wq->sq, mapping));
+                         dma_unmap_addr(&wq->sq, mapping));
        c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
        kfree(wq->rq.sw_rq);
        kfree(wq->sq.sw_sq);
@@ -99,7 +99,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
        if (!wq->sq.queue)
                goto err5;
        memset(wq->sq.queue, 0, wq->sq.memsize);
-       pci_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
+       dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
 
        wq->rq.queue = dma_alloc_coherent(&(rdev->lldi.pdev->dev),
                                          wq->rq.memsize, &(wq->rq.dma_addr),
@@ -112,7 +112,7 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                wq->rq.queue,
                (unsigned long long)virt_to_phys(wq->rq.queue));
        memset(wq->rq.queue, 0, wq->rq.memsize);
-       pci_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);
+       dma_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);
 
        wq->db = rdev->lldi.db_reg;
        wq->gts = rdev->lldi.gts_reg;
@@ -217,11 +217,11 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
 err7:
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          wq->rq.memsize, wq->rq.queue,
-                         pci_unmap_addr(&wq->rq, mapping));
+                         dma_unmap_addr(&wq->rq, mapping));
 err6:
        dma_free_coherent(&(rdev->lldi.pdev->dev),
                          wq->sq.memsize, wq->sq.queue,
-                         pci_unmap_addr(&wq->sq, mapping));
+                         dma_unmap_addr(&wq->sq, mapping));
 err5:
        c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
 err4:
@@ -572,9 +572,13 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                        err = build_rdma_write(wqe, wr, &len16);
                        break;
                case IB_WR_RDMA_READ:
+               case IB_WR_RDMA_READ_WITH_INV:
                        fw_opcode = FW_RI_RDMA_READ_WR;
                        swsqe->opcode = FW_RI_READ_REQ;
-                       fw_flags = 0;
+                       if (wr->opcode == IB_WR_RDMA_READ_WITH_INV)
+                               fw_flags |= FW_RI_RDMA_READ_INVALIDATE;
+                       else
+                               fw_flags = 0;
                        err = build_rdma_read(wqe, wr, &len16);
                        if (err)
                                break;
@@ -588,6 +592,8 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
                        err = build_fastreg(wqe, wr, &len16);
                        break;
                case IB_WR_LOCAL_INV:
+                       if (wr->send_flags & IB_SEND_FENCE)
+                               fw_flags |= FW_RI_LOCAL_FENCE_FLAG;
                        fw_opcode = FW_RI_INV_LSTAG_WR;
                        swsqe->opcode = FW_RI_LOCAL_INV;
                        err = build_inv_stag(wqe, wr, &len16);
@@ -1339,7 +1345,6 @@ int c4iw_destroy_qp(struct ib_qp *ib_qp)
        wait_event(qhp->wait, !qhp->ep);
 
        remove_handle(rhp, &rhp->qpidr, qhp->wq.sq.qid);
-       remove_handle(rhp, &rhp->qpidr, qhp->wq.rq.qid);
        atomic_dec(&qhp->refcnt);
        wait_event(qhp->wait, !atomic_read(&qhp->refcnt));
 
@@ -1442,30 +1447,26 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
        if (ret)
                goto err2;
 
-       ret = insert_handle(rhp, &rhp->qpidr, qhp, qhp->wq.rq.qid);
-       if (ret)
-               goto err3;
-
        if (udata) {
                mm1 = kmalloc(sizeof *mm1, GFP_KERNEL);
                if (!mm1) {
                        ret = -ENOMEM;
-                       goto err4;
+                       goto err3;
                }
                mm2 = kmalloc(sizeof *mm2, GFP_KERNEL);
                if (!mm2) {
                        ret = -ENOMEM;
-                       goto err5;
+                       goto err4;
                }
                mm3 = kmalloc(sizeof *mm3, GFP_KERNEL);
                if (!mm3) {
                        ret = -ENOMEM;
-                       goto err6;
+                       goto err5;
                }
                mm4 = kmalloc(sizeof *mm4, GFP_KERNEL);
                if (!mm4) {
                        ret = -ENOMEM;
-                       goto err7;
+                       goto err6;
                }
 
                uresp.qid_mask = rhp->rdev.qpmask;
@@ -1487,7 +1488,7 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
                spin_unlock(&ucontext->mmap_lock);
                ret = ib_copy_to_udata(udata, &uresp, sizeof uresp);
                if (ret)
-                       goto err8;
+                       goto err7;
                mm1->key = uresp.sq_key;
                mm1->addr = virt_to_phys(qhp->wq.sq.queue);
                mm1->len = PAGE_ALIGN(qhp->wq.sq.memsize);
@@ -1511,16 +1512,14 @@ struct ib_qp *c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
             __func__, qhp, qhp->attr.sq_num_entries, qhp->attr.rq_num_entries,
             qhp->wq.sq.qid);
        return &qhp->ibqp;
-err8:
-       kfree(mm4);
 err7:
-       kfree(mm3);
+       kfree(mm4);
 err6:
-       kfree(mm2);
+       kfree(mm3);
 err5:
-       kfree(mm1);
+       kfree(mm2);
 err4:
-       remove_handle(rhp, &rhp->qpidr, qhp->wq.rq.qid);
+       kfree(mm1);
 err3:
        remove_handle(rhp, &rhp->qpidr, qhp->wq.sq.qid);
 err2: