vme: switch from 'pci_' to 'dma_' API
The wrappers in include/linux/pci-dma-compat.h should go away. The patch has been generated with the coccinelle script below and has been hand modified to replace GFP_ with a correct flag. It has been compile tested. When memory is allocated in 'ca91cx42_alloc_consistent()' and 'tsi148_alloc_consistent()' GFP_KERNEL can be used because both functions are called only from 'vme_alloc_consistent()' (vme.c). This function is only called from the 'vme_user_probe()' probe function and no lock is taken in the between. When memory is allocated in 'ca91cx42_crcsr_init()' and 'tsi148_crcsr_init()' GFP_KERNEL can be used because both functions are called only from their corresponding probe function and no lock is taken in the between. @@ @@ - PCI_DMA_BIDIRECTIONAL + DMA_BIDIRECTIONAL @@ @@ - PCI_DMA_TODEVICE + DMA_TO_DEVICE @@ @@ - PCI_DMA_FROMDEVICE + DMA_FROM_DEVICE @@ @@ - PCI_DMA_NONE + DMA_NONE @@ expression e1, e2, e3; @@ - pci_alloc_consistent(e1, e2, e3) + dma_alloc_coherent(&e1->dev, e2, e3, GFP_) @@ expression e1, e2, e3; @@ - pci_zalloc_consistent(e1, e2, e3) + dma_alloc_coherent(&e1->dev, e2, e3, GFP_) @@ expression e1, e2, e3, e4; @@ - pci_free_consistent(e1, e2, e3, e4) + dma_free_coherent(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_map_single(e1, e2, e3, e4) + dma_map_single(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_unmap_single(e1, e2, e3, e4) + dma_unmap_single(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4, e5; @@ - pci_map_page(e1, e2, e3, e4, e5) + dma_map_page(&e1->dev, e2, e3, e4, e5) @@ expression e1, e2, e3, e4; @@ - pci_unmap_page(e1, e2, e3, e4) + dma_unmap_page(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_map_sg(e1, e2, e3, e4) + dma_map_sg(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_unmap_sg(e1, e2, e3, e4) + dma_unmap_sg(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_dma_sync_single_for_cpu(e1, e2, e3, e4) + dma_sync_single_for_cpu(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_dma_sync_single_for_device(e1, e2, e3, e4) + dma_sync_single_for_device(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_dma_sync_sg_for_cpu(e1, e2, e3, e4) + dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4) @@ expression e1, e2, e3, e4; @@ - pci_dma_sync_sg_for_device(e1, e2, e3, e4) + dma_sync_sg_for_device(&e1->dev, e2, e3, e4) @@ expression e1, e2; @@ - pci_dma_mapping_error(e1, e2) + dma_mapping_error(&e1->dev, e2) @@ expression e1, e2; @@ - pci_set_dma_mask(e1, e2) + dma_set_mask(&e1->dev, e2) @@ expression e1, e2; @@ - pci_set_consistent_dma_mask(e1, e2) + dma_set_coherent_mask(&e1->dev, e2) Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/20201206071352.21949-1-christophe.jaillet@wanadoo.fr Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>zero-sugar-mainline-defconfig
Christophe JAILLET
Greg Kroah-Hartman
parent
1749c90489
commit
660745a569
|
|
@ -1510,7 +1510,7 @@ static void *ca91cx42_alloc_consistent(struct device *parent, size_t size,
|
|||
/* Find pci_dev container of dev */
|
||||
pdev = to_pci_dev(parent);
|
||||
|
||||
return pci_alloc_consistent(pdev, size, dma);
|
||||
return dma_alloc_coherent(&pdev->dev, size, dma, GFP_KERNEL);
|
||||
}
|
||||
|
||||
static void ca91cx42_free_consistent(struct device *parent, size_t size,
|
||||
|
|
@ -1521,7 +1521,7 @@ static void ca91cx42_free_consistent(struct device *parent, size_t size,
|
|||
/* Find pci_dev container of dev */
|
||||
pdev = to_pci_dev(parent);
|
||||
|
||||
pci_free_consistent(pdev, size, vaddr, dma);
|
||||
dma_free_coherent(&pdev->dev, size, vaddr, dma);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1555,8 +1555,9 @@ static int ca91cx42_crcsr_init(struct vme_bridge *ca91cx42_bridge,
|
|||
}
|
||||
|
||||
/* Allocate mem for CR/CSR image */
|
||||
bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
|
||||
&bridge->crcsr_bus);
|
||||
bridge->crcsr_kernel = dma_alloc_coherent(&pdev->dev,
|
||||
VME_CRCSR_BUF_SIZE,
|
||||
&bridge->crcsr_bus, GFP_KERNEL);
|
||||
if (!bridge->crcsr_kernel) {
|
||||
dev_err(&pdev->dev, "Failed to allocate memory for CR/CSR "
|
||||
"image\n");
|
||||
|
|
@ -1589,8 +1590,8 @@ static void ca91cx42_crcsr_exit(struct vme_bridge *ca91cx42_bridge,
|
|||
/* Free image */
|
||||
iowrite32(0, bridge->base + VCSR_TO);
|
||||
|
||||
pci_free_consistent(pdev, VME_CRCSR_BUF_SIZE, bridge->crcsr_kernel,
|
||||
bridge->crcsr_bus);
|
||||
dma_free_coherent(&pdev->dev, VME_CRCSR_BUF_SIZE,
|
||||
bridge->crcsr_kernel, bridge->crcsr_bus);
|
||||
}
|
||||
|
||||
static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
|
|
|
|||
|
|
@ -2155,7 +2155,7 @@ static void *tsi148_alloc_consistent(struct device *parent, size_t size,
|
|||
/* Find pci_dev container of dev */
|
||||
pdev = to_pci_dev(parent);
|
||||
|
||||
return pci_alloc_consistent(pdev, size, dma);
|
||||
return dma_alloc_coherent(&pdev->dev, size, dma, GFP_KERNEL);
|
||||
}
|
||||
|
||||
static void tsi148_free_consistent(struct device *parent, size_t size,
|
||||
|
|
@ -2166,7 +2166,7 @@ static void tsi148_free_consistent(struct device *parent, size_t size,
|
|||
/* Find pci_dev container of dev */
|
||||
pdev = to_pci_dev(parent);
|
||||
|
||||
pci_free_consistent(pdev, size, vaddr, dma);
|
||||
dma_free_coherent(&pdev->dev, size, vaddr, dma);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -2192,8 +2192,9 @@ static int tsi148_crcsr_init(struct vme_bridge *tsi148_bridge,
|
|||
bridge = tsi148_bridge->driver_priv;
|
||||
|
||||
/* Allocate mem for CR/CSR image */
|
||||
bridge->crcsr_kernel = pci_zalloc_consistent(pdev, VME_CRCSR_BUF_SIZE,
|
||||
&bridge->crcsr_bus);
|
||||
bridge->crcsr_kernel = dma_alloc_coherent(&pdev->dev,
|
||||
VME_CRCSR_BUF_SIZE,
|
||||
&bridge->crcsr_bus, GFP_KERNEL);
|
||||
if (!bridge->crcsr_kernel) {
|
||||
dev_err(tsi148_bridge->parent, "Failed to allocate memory for "
|
||||
"CR/CSR image\n");
|
||||
|
|
@ -2261,8 +2262,8 @@ static void tsi148_crcsr_exit(struct vme_bridge *tsi148_bridge,
|
|||
iowrite32be(0, bridge->base + TSI148_LCSR_CROU);
|
||||
iowrite32be(0, bridge->base + TSI148_LCSR_CROL);
|
||||
|
||||
pci_free_consistent(pdev, VME_CRCSR_BUF_SIZE, bridge->crcsr_kernel,
|
||||
bridge->crcsr_bus);
|
||||
dma_free_coherent(&pdev->dev, VME_CRCSR_BUF_SIZE,
|
||||
bridge->crcsr_kernel, bridge->crcsr_bus);
|
||||
}
|
||||
|
||||
static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
||||
|
|
|
|||
Loading…
Reference in New Issue