Commit e7494440 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Roland Dreier

RDMA/amso1100: Use the dma state API instead of pci equivalents

The DMA API is preferred; no functional change.
Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 0eddb519
...@@ -250,7 +250,7 @@ struct c2_array { ...@@ -250,7 +250,7 @@ struct c2_array {
struct sp_chunk { struct sp_chunk {
struct sp_chunk *next; struct sp_chunk *next;
dma_addr_t dma_addr; dma_addr_t dma_addr;
DECLARE_PCI_UNMAP_ADDR(mapping); DEFINE_DMA_UNMAP_ADDR(mapping);
u16 head; u16 head;
u16 shared_ptr[0]; u16 shared_ptr[0];
}; };
......
...@@ -49,7 +49,7 @@ static int c2_alloc_mqsp_chunk(struct c2_dev *c2dev, gfp_t gfp_mask, ...@@ -49,7 +49,7 @@ static int c2_alloc_mqsp_chunk(struct c2_dev *c2dev, gfp_t gfp_mask,
return -ENOMEM; return -ENOMEM;
new_head->dma_addr = dma_addr; new_head->dma_addr = dma_addr;
pci_unmap_addr_set(new_head, mapping, new_head->dma_addr); dma_unmap_addr_set(new_head, mapping, new_head->dma_addr);
new_head->next = NULL; new_head->next = NULL;
new_head->head = 0; new_head->head = 0;
...@@ -81,7 +81,7 @@ void c2_free_mqsp_pool(struct c2_dev *c2dev, struct sp_chunk *root) ...@@ -81,7 +81,7 @@ void c2_free_mqsp_pool(struct c2_dev *c2dev, struct sp_chunk *root)
while (root) { while (root) {
next = root->next; next = root->next;
dma_free_coherent(&c2dev->pcidev->dev, PAGE_SIZE, root, dma_free_coherent(&c2dev->pcidev->dev, PAGE_SIZE, root,
pci_unmap_addr(root, mapping)); dma_unmap_addr(root, mapping));
root = next; root = next;
} }
} }
......
...@@ -257,7 +257,7 @@ int c2_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags notify_flags) ...@@ -257,7 +257,7 @@ int c2_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags notify_flags)
static void c2_free_cq_buf(struct c2_dev *c2dev, struct c2_mq *mq) static void c2_free_cq_buf(struct c2_dev *c2dev, struct c2_mq *mq)
{ {
dma_free_coherent(&c2dev->pcidev->dev, mq->q_size * mq->msg_size, dma_free_coherent(&c2dev->pcidev->dev, mq->q_size * mq->msg_size,
mq->msg_pool.host, pci_unmap_addr(mq, mapping)); mq->msg_pool.host, dma_unmap_addr(mq, mapping));
} }
static int c2_alloc_cq_buf(struct c2_dev *c2dev, struct c2_mq *mq, int q_size, static int c2_alloc_cq_buf(struct c2_dev *c2dev, struct c2_mq *mq, int q_size,
...@@ -278,7 +278,7 @@ static int c2_alloc_cq_buf(struct c2_dev *c2dev, struct c2_mq *mq, int q_size, ...@@ -278,7 +278,7 @@ static int c2_alloc_cq_buf(struct c2_dev *c2dev, struct c2_mq *mq, int q_size,
NULL, /* peer (currently unknown) */ NULL, /* peer (currently unknown) */
C2_MQ_HOST_TARGET); C2_MQ_HOST_TARGET);
pci_unmap_addr_set(mq, mapping, mq->host_dma); dma_unmap_addr_set(mq, mapping, mq->host_dma);
return 0; return 0;
} }
......
...@@ -71,7 +71,7 @@ struct c2_mq { ...@@ -71,7 +71,7 @@ struct c2_mq {
u8 __iomem *adapter; u8 __iomem *adapter;
} msg_pool; } msg_pool;
dma_addr_t host_dma; dma_addr_t host_dma;
DECLARE_PCI_UNMAP_ADDR(mapping); DEFINE_DMA_UNMAP_ADDR(mapping);
u16 hint_count; u16 hint_count;
u16 priv; u16 priv;
struct c2_mq_shared __iomem *peer; struct c2_mq_shared __iomem *peer;
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
struct c2_buf_list { struct c2_buf_list {
void *buf; void *buf;
DECLARE_PCI_UNMAP_ADDR(mapping) DEFINE_DMA_UNMAP_ADDR(mapping);
}; };
......
...@@ -524,7 +524,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev) ...@@ -524,7 +524,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
err = -ENOMEM; err = -ENOMEM;
goto bail1; goto bail1;
} }
pci_unmap_addr_set(&c2dev->rep_vq, mapping, c2dev->rep_vq.host_dma); dma_unmap_addr_set(&c2dev->rep_vq, mapping, c2dev->rep_vq.host_dma);
pr_debug("%s rep_vq va %p dma %llx\n", __func__, q1_pages, pr_debug("%s rep_vq va %p dma %llx\n", __func__, q1_pages,
(unsigned long long) c2dev->rep_vq.host_dma); (unsigned long long) c2dev->rep_vq.host_dma);
c2_mq_rep_init(&c2dev->rep_vq, c2_mq_rep_init(&c2dev->rep_vq,
...@@ -545,7 +545,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev) ...@@ -545,7 +545,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
err = -ENOMEM; err = -ENOMEM;
goto bail2; goto bail2;
} }
pci_unmap_addr_set(&c2dev->aeq, mapping, c2dev->aeq.host_dma); dma_unmap_addr_set(&c2dev->aeq, mapping, c2dev->aeq.host_dma);
pr_debug("%s aeq va %p dma %llx\n", __func__, q2_pages, pr_debug("%s aeq va %p dma %llx\n", __func__, q2_pages,
(unsigned long long) c2dev->aeq.host_dma); (unsigned long long) c2dev->aeq.host_dma);
c2_mq_rep_init(&c2dev->aeq, c2_mq_rep_init(&c2dev->aeq,
...@@ -596,11 +596,11 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev) ...@@ -596,11 +596,11 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev)
bail3: bail3:
dma_free_coherent(&c2dev->pcidev->dev, dma_free_coherent(&c2dev->pcidev->dev,
c2dev->aeq.q_size * c2dev->aeq.msg_size, c2dev->aeq.q_size * c2dev->aeq.msg_size,
q2_pages, pci_unmap_addr(&c2dev->aeq, mapping)); q2_pages, dma_unmap_addr(&c2dev->aeq, mapping));
bail2: bail2:
dma_free_coherent(&c2dev->pcidev->dev, dma_free_coherent(&c2dev->pcidev->dev,
c2dev->rep_vq.q_size * c2dev->rep_vq.msg_size, c2dev->rep_vq.q_size * c2dev->rep_vq.msg_size,
q1_pages, pci_unmap_addr(&c2dev->rep_vq, mapping)); q1_pages, dma_unmap_addr(&c2dev->rep_vq, mapping));
bail1: bail1:
c2_free_mqsp_pool(c2dev, c2dev->kern_mqsp_pool); c2_free_mqsp_pool(c2dev, c2dev->kern_mqsp_pool);
bail0: bail0:
...@@ -637,13 +637,13 @@ void __devexit c2_rnic_term(struct c2_dev *c2dev) ...@@ -637,13 +637,13 @@ void __devexit c2_rnic_term(struct c2_dev *c2dev)
dma_free_coherent(&c2dev->pcidev->dev, dma_free_coherent(&c2dev->pcidev->dev,
c2dev->aeq.q_size * c2dev->aeq.msg_size, c2dev->aeq.q_size * c2dev->aeq.msg_size,
c2dev->aeq.msg_pool.host, c2dev->aeq.msg_pool.host,
pci_unmap_addr(&c2dev->aeq, mapping)); dma_unmap_addr(&c2dev->aeq, mapping));
/* Free the verbs reply queue */ /* Free the verbs reply queue */
dma_free_coherent(&c2dev->pcidev->dev, dma_free_coherent(&c2dev->pcidev->dev,
c2dev->rep_vq.q_size * c2dev->rep_vq.msg_size, c2dev->rep_vq.q_size * c2dev->rep_vq.msg_size,
c2dev->rep_vq.msg_pool.host, c2dev->rep_vq.msg_pool.host,
pci_unmap_addr(&c2dev->rep_vq, mapping)); dma_unmap_addr(&c2dev->rep_vq, mapping));
/* Free the MQ shared pointer pool */ /* Free the MQ shared pointer pool */
c2_free_mqsp_pool(c2dev, c2dev->kern_mqsp_pool); c2_free_mqsp_pool(c2dev, c2dev->kern_mqsp_pool);
......
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