IB/sdp - use the ib_dma interface

The SDP module should be using the ib_dma_* interface, not the dma_*
interface directly.  This fixes a crash on InfiniPath hardware.

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Robert Walsh <robert.walsh@qlogic.com>

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index 068a8616d3b7b21095a8eb1725bed0f3032ed0b4..eb5f7526d4944ab50bc7a824abf74e0e0247604d 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -82,7 +82,7 @@ struct sdp_bsdh {
 
 struct sdp_buf {
         struct sk_buff *skb;
-        dma_addr_t      mapping[SDP_MAX_SEND_SKB_FRAGS + 1];
+        u64             mapping[SDP_MAX_SEND_SKB_FRAGS + 1];
 };
 
 struct sdp_sock {
@@ -118,7 +118,7 @@ struct sdp_sock {
        struct ib_qp *qp;
        struct ib_cq *cq;
        struct ib_mr *mr;
-       struct device *dma_device;
+       struct ib_device *ib_device;
 
        /* SDP specific */
        struct sdp_buf *rx_ring;

diff --git a/drivers/infiniband/ulp/sdp/sdp_bcopy.c b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
index 06af486f7bf3345457c1a678b55902a382479d8f..bb9d235730f1fab8abe5d5f4b52ba8006bbea5d7 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_bcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
@@ -76,8 +76,8 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb, u8 mid)
        struct sdp_bsdh *h = (struct sdp_bsdh *)skb_push(skb, sizeof *h);
        unsigned mseq = ssk->tx_head;
        int i, rc, frags;
-       dma_addr_t addr;
-       struct device *hwdev;
+       u64 addr;
+       struct ib_device *dev;
        struct ib_sge *sge;
        struct ib_send_wr *bad_wr;
 
@@ -93,27 +93,26 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb, u8 mid)
 
        tx_req = &ssk->tx_ring[mseq & (SDP_TX_SIZE - 1)];
        tx_req->skb = skb;
-       hwdev = ssk->dma_device;
+       dev = ssk->ib_device;
        sge = ssk->ibsge;
-       addr = dma_map_single(hwdev,
-                             skb->data, skb->len - skb->data_len,
-                             DMA_TO_DEVICE);
+       addr = ib_dma_map_single(dev, skb->data, skb->len - skb->data_len,
+                                DMA_TO_DEVICE);
        tx_req->mapping[0] = addr;
 
        /* TODO: proper error handling */
-       BUG_ON(dma_mapping_error(addr));
+       BUG_ON(ib_dma_mapping_error(dev, addr));
 
-       sge->addr = (u64)addr;
+       sge->addr = addr;
        sge->length = skb->len - skb->data_len;
        sge->lkey = ssk->mr->lkey;
        frags = skb_shinfo(skb)->nr_frags;
        for (i = 0; i < frags; ++i) {
                ++sge;
-               addr = dma_map_page(hwdev, skb_shinfo(skb)->frags[i].page,
-                                   skb_shinfo(skb)->frags[i].page_offset,
-                                   skb_shinfo(skb)->frags[i].size,
-                                   DMA_TO_DEVICE);
-               BUG_ON(dma_mapping_error(addr));
+               addr = ib_dma_map_page(dev, skb_shinfo(skb)->frags[i].page,
+                                      skb_shinfo(skb)->frags[i].page_offset,
+                                      skb_shinfo(skb)->frags[i].size,
+                                      DMA_TO_DEVICE);
+               BUG_ON(ib_dma_mapping_error(dev, addr));
                tx_req->mapping[i + 1] = addr;
                sge->addr = addr;
                sge->length = skb_shinfo(skb)->frags[i].size;
@@ -141,7 +140,7 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb, u8 mid)
 
 struct sk_buff *sdp_send_completion(struct sdp_sock *ssk, int mseq)
 {
-       struct device *hwdev;
+       struct ib_device *dev;
        struct sdp_buf *tx_req;
        struct sk_buff *skb;
        int i, frags;
@@ -152,16 +151,16 @@ struct sk_buff *sdp_send_completion(struct sdp_sock *ssk, int mseq)
                return NULL;
        }
 
-       hwdev = ssk->dma_device;
+       dev = ssk->ib_device;
         tx_req = &ssk->tx_ring[mseq & (SDP_TX_SIZE - 1)];
        skb = tx_req->skb;
-       dma_unmap_single(hwdev, tx_req->mapping[0], skb->len - skb->data_len,
-                        DMA_TO_DEVICE);
+       ib_dma_unmap_single(dev, tx_req->mapping[0], skb->len - skb->data_len,
+                           DMA_TO_DEVICE);
        frags = skb_shinfo(skb)->nr_frags;
        for (i = 0; i < frags; ++i) {
-               dma_unmap_page(hwdev, tx_req->mapping[i + 1],
-                              skb_shinfo(skb)->frags[i].size,
-                              DMA_TO_DEVICE);
+               ib_dma_unmap_page(dev, tx_req->mapping[i + 1],
+                                 skb_shinfo(skb)->frags[i].size,
+                                 DMA_TO_DEVICE);
        }
 
        ++ssk->tx_tail;
@@ -173,8 +172,8 @@ static void sdp_post_recv(struct sdp_sock *ssk)
 {
        struct sdp_buf *rx_req;
        int i, rc, frags;
-       dma_addr_t addr;
-       struct device *hwdev;
+       u64 addr;
+       struct ib_device *dev;
        struct ib_sge *sge;
        struct ib_recv_wr *bad_wr;
        struct sk_buff *skb;
@@ -205,11 +204,10 @@ static void sdp_post_recv(struct sdp_sock *ssk)
 
         rx_req = ssk->rx_ring + (id & (SDP_RX_SIZE - 1));
        rx_req->skb = skb;
-       hwdev = ssk->dma_device;
+       dev = ssk->ib_device;
        sge = ssk->ibsge;
-       addr = dma_map_single(hwdev, h, SDP_HEAD_SIZE,
-                             DMA_FROM_DEVICE);
-       BUG_ON(dma_mapping_error(addr));
+       addr = ib_dma_map_single(dev, h, SDP_HEAD_SIZE, DMA_FROM_DEVICE);
+       BUG_ON(ib_dma_mapping_error(dev, addr));
 
        rx_req->mapping[0] = addr;
 
@@ -220,11 +218,11 @@ static void sdp_post_recv(struct sdp_sock *ssk)
        frags = skb_shinfo(skb)->nr_frags;
        for (i = 0; i < frags; ++i) {
                ++sge;
-               addr = dma_map_page(hwdev, skb_shinfo(skb)->frags[i].page,
-                                   skb_shinfo(skb)->frags[i].page_offset,
-                                   skb_shinfo(skb)->frags[i].size,
-                                   DMA_FROM_DEVICE);
-               BUG_ON(dma_mapping_error(addr));
+               addr = ib_dma_map_page(dev, skb_shinfo(skb)->frags[i].page,
+                                      skb_shinfo(skb)->frags[i].page_offset,
+                                      skb_shinfo(skb)->frags[i].size,
+                                      DMA_FROM_DEVICE);
+               BUG_ON(ib_dma_mapping_error(dev, addr));
                rx_req->mapping[i + 1] = addr;
                sge->addr = addr;
                sge->length = skb_shinfo(skb)->frags[i].size;
@@ -267,7 +265,7 @@ void sdp_post_recvs(struct sdp_sock *ssk)
 struct sk_buff *sdp_recv_completion(struct sdp_sock *ssk, int id)
 {
        struct sdp_buf *rx_req;
-       struct device *hwdev;
+       struct ib_device *dev;
        struct sk_buff *skb;
        int i, frags;
 
@@ -277,16 +275,16 @@ struct sk_buff *sdp_recv_completion(struct sdp_sock *ssk, int id)
                return NULL;
        }
 
-       hwdev = ssk->dma_device;
+       dev = ssk->ib_device;
         rx_req = &ssk->rx_ring[id & (SDP_RX_SIZE - 1)];
        skb = rx_req->skb;
-       dma_unmap_single(hwdev, rx_req->mapping[0], SDP_HEAD_SIZE,
-                        DMA_FROM_DEVICE);
+       ib_dma_unmap_single(dev, rx_req->mapping[0], SDP_HEAD_SIZE,
+                           DMA_FROM_DEVICE);
        frags = skb_shinfo(skb)->nr_frags;
        for (i = 0; i < frags; ++i)
-               dma_unmap_page(hwdev, rx_req->mapping[i + 1],
-                              skb_shinfo(skb)->frags[i].size,
-                              DMA_TO_DEVICE);
+               ib_dma_unmap_page(dev, rx_req->mapping[i + 1],
+                                 skb_shinfo(skb)->frags[i].size,
+                                 DMA_TO_DEVICE);
        ++ssk->rx_tail;
        --ssk->remote_credits;
        return skb;

diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index 64a90fd2258ff9dd2ca43be242e45ef0ad022302..9700e15f0b9f51672bbb354e530ad8c09388ffe2 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -171,7 +171,7 @@ int sdp_init_qp(struct sock *sk, struct rdma_cm_id *id)
        }
        sdp_sk(sk)->cq = cq;
        sdp_sk(sk)->qp = id->qp;
-       sdp_sk(sk)->dma_device = device->dma_device;
+       sdp_sk(sk)->ib_device = device;
 
        init_waitqueue_head(&sdp_sk(sk)->wq);