mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

umem: switch to the generic DMA API

Browse source 
The PCI DMA API is deprecated, switch to the generic DMA API instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-10-18 15:15:14 +02:00 committed by Jens Axboe
parent 931da2f7a5
commit b46d40daba
1 changed files with 18 additions and 20 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/block/umem.c
View file

@ -363,12 +363,12 @@ static int add_bio(struct cardinfo *card)
vec = bio_iter_iovec(bio, card->current_iter); vec = bio_iter_iovec(bio, card->current_iter);
dma_handle = pci_map_page(card->dev, dma_handle = dma_map_page(&card->dev->dev,
vec.bv_page, vec.bv_page,
vec.bv_offset, vec.bv_offset,
vec.bv_len, vec.bv_len,
bio_op(bio) == REQ_OP_READ ? bio_op(bio) == REQ_OP_READ ?
PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE); DMA_FROM_DEVICE : DMA_TO_DEVICE);
p = &card->mm_pages[card->Ready]; p = &card->mm_pages[card->Ready];
desc = &p->desc[p->cnt]; desc = &p->desc[p->cnt];
@ -448,10 +448,10 @@ static void process_page(unsigned long data)
page->iter = page->bio->bi_iter; page->iter = page->bio->bi_iter;
} }
pci_unmap_page(card->dev, desc->data_dma_handle, dma_unmap_page(&card->dev->dev, desc->data_dma_handle,
vec.bv_len, vec.bv_len,
(control & DMASCR_TRANSFER_READ) ? (control & DMASCR_TRANSFER_READ) ?
PCI_DMA_TODEVICE : PCI_DMA_FROMDEVICE); DMA_TO_DEVICE : DMA_FROM_DEVICE);
if (control & DMASCR_HARD_ERROR) { if (control & DMASCR_HARD_ERROR) {
/* error */ /* error */
bio->bi_status = BLK_STS_IOERR; bio->bi_status = BLK_STS_IOERR;
@ -817,8 +817,8 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
dev_printk(KERN_INFO, &dev->dev, dev_printk(KERN_INFO, &dev->dev,
"Micro Memory(tm) controller found (PCI Mem Module (Battery Backup))\n"); "Micro Memory(tm) controller found (PCI Mem Module (Battery Backup))\n");
if (pci_set_dma_mask(dev, DMA_BIT_MASK(64)) && if (dma_set_mask(&dev->dev, DMA_BIT_MASK(64)) &&
pci_set_dma_mask(dev, DMA_BIT_MASK(32))) { dma_set_mask(&dev->dev, DMA_BIT_MASK(32))) {
dev_printk(KERN_WARNING, &dev->dev, "NO suitable DMA found\n"); dev_printk(KERN_WARNING, &dev->dev, "NO suitable DMA found\n");
return -ENOMEM; return -ENOMEM;
} }
@ -871,12 +871,10 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
goto failed_magic; goto failed_magic;
} }
card->mm_pages[0].desc = pci_alloc_consistent(card->dev, card->mm_pages[0].desc = dma_alloc_coherent(&card->dev->dev,
PAGE_SIZE * 2, PAGE_SIZE * 2, &card->mm_pages[0].page_dma, GFP_KERNEL);
&card->mm_pages[0].page_dma); card->mm_pages[1].desc = dma_alloc_coherent(&card->dev->dev,
card->mm_pages[1].desc = pci_alloc_consistent(card->dev, PAGE_SIZE * 2, &card->mm_pages[1].page_dma, GFP_KERNEL);
PAGE_SIZE * 2,
&card->mm_pages[1].page_dma);
if (card->mm_pages[0].desc == NULL || if (card->mm_pages[0].desc == NULL ||
card->mm_pages[1].desc == NULL) { card->mm_pages[1].desc == NULL) {
dev_printk(KERN_ERR, &card->dev->dev, "alloc failed\n"); dev_printk(KERN_ERR, &card->dev->dev, "alloc failed\n");
@ -1002,11 +1000,11 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
failed_req_irq: failed_req_irq:
failed_alloc: failed_alloc:
if (card->mm_pages[0].desc) if (card->mm_pages[0].desc)
pci_free_consistent(card->dev, PAGE_SIZE*2, dma_free_coherent(&card->dev->dev, PAGE_SIZE * 2,
card->mm_pages[0].desc, card->mm_pages[0].desc,
card->mm_pages[0].page_dma); card->mm_pages[0].page_dma);
if (card->mm_pages[1].desc) if (card->mm_pages[1].desc)
pci_free_consistent(card->dev, PAGE_SIZE*2, dma_free_coherent(&card->dev->dev, PAGE_SIZE * 2,
card->mm_pages[1].desc, card->mm_pages[1].desc,
card->mm_pages[1].page_dma); card->mm_pages[1].page_dma);
failed_magic: failed_magic:
@ -1027,11 +1025,11 @@ static void mm_pci_remove(struct pci_dev *dev)
iounmap(card->csr_remap); iounmap(card->csr_remap);
if (card->mm_pages[0].desc) if (card->mm_pages[0].desc)
pci_free_consistent(card->dev, PAGE_SIZE*2, dma_free_coherent(&card->dev->dev, PAGE_SIZE * 2,
card->mm_pages[0].desc, card->mm_pages[0].desc,
card->mm_pages[0].page_dma); card->mm_pages[0].page_dma);
if (card->mm_pages[1].desc) if (card->mm_pages[1].desc)
pci_free_consistent(card->dev, PAGE_SIZE*2, dma_free_coherent(&card->dev->dev, PAGE_SIZE * 2,
card->mm_pages[1].desc, card->mm_pages[1].desc,
card->mm_pages[1].page_dma); card->mm_pages[1].page_dma);
blk_cleanup_queue(card->queue); blk_cleanup_queue(card->queue);