The wrappers in include/linux/pci-dma-compat.h should go away.
The patch has been generated with the coccinelle script below.
It has been compile tested.
@@ @@ - 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 --- If needed, see post from Christoph Hellwig on the kernel-janitors ML: https://marc.info/?l=kernel-janitors&m=158745678307186&w=4 --- drivers/gpu/drm/radeon/radeon_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index ac8c3251b616..4f0fbf667431 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -785,7 +785,7 @@ int radeon_dummy_page_init(struct radeon_device *rdev) if (rdev->dummy_page.page == NULL) return -ENOMEM; rdev->dummy_page.addr = dma_map_page(&rdev->pdev->dev, rdev->dummy_page.page, - 0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); + 0, PAGE_SIZE, DMA_BIDIRECTIONAL); if (dma_mapping_error(&rdev->pdev->dev, rdev->dummy_page.addr)) { dev_err(&rdev->pdev->dev, "Failed to DMA MAP the dummy page\n"); __free_page(rdev->dummy_page.page); @@ -808,8 +808,8 @@ void radeon_dummy_page_fini(struct radeon_device *rdev) { if (rdev->dummy_page.page == NULL) return; - pci_unmap_page(rdev->pdev, rdev->dummy_page.addr, - PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); + dma_unmap_page(&rdev->pdev->dev, rdev->dummy_page.addr, PAGE_SIZE, + DMA_BIDIRECTIONAL); __free_page(rdev->dummy_page.page); rdev->dummy_page.page = NULL; }
Am 22.08.21 um 23:23 schrieb Christophe JAILLET:
The wrappers in include/linux/pci-dma-compat.h should go away.
The patch has been generated with the coccinelle script below.
It has been compile tested.
@@ @@
- 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
Reviewed-by: Christian König christian.koenig@amd.com
Should we pick them up or do you want to push them upstream?
Regards, Christian.
If needed, see post from Christoph Hellwig on the kernel-janitors ML: https://marc.info/?l=kernel-janitors&m=158745678307186&w=4
drivers/gpu/drm/radeon/radeon_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index ac8c3251b616..4f0fbf667431 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -785,7 +785,7 @@ int radeon_dummy_page_init(struct radeon_device *rdev) if (rdev->dummy_page.page == NULL) return -ENOMEM; rdev->dummy_page.addr = dma_map_page(&rdev->pdev->dev, rdev->dummy_page.page,
0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
0, PAGE_SIZE, DMA_BIDIRECTIONAL);@@ -808,8 +808,8 @@ void radeon_dummy_page_fini(struct radeon_device *rdev) { if (rdev->dummy_page.page == NULL) return;
- pci_unmap_page(rdev->pdev, rdev->dummy_page.addr,
PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
- dma_unmap_page(&rdev->pdev->dev, rdev->dummy_page.addr, PAGE_SIZE,
DMA_BIDIRECTIONAL);
Applied. Thanks!
Alex
On Mon, Aug 23, 2021 at 2:17 AM Christian König christian.koenig@amd.com wrote:
Am 22.08.21 um 23:23 schrieb Christophe JAILLET:
The wrappers in include/linux/pci-dma-compat.h should go away.
The patch has been generated with the coccinelle script below.
It has been compile tested.
@@ @@
- 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
Reviewed-by: Christian König christian.koenig@amd.com
Should we pick them up or do you want to push them upstream?
Regards, Christian.
If needed, see post from Christoph Hellwig on the kernel-janitors ML: https://marc.info/?l=kernel-janitors&m=158745678307186&w=4
drivers/gpu/drm/radeon/radeon_device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index ac8c3251b616..4f0fbf667431 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -785,7 +785,7 @@ int radeon_dummy_page_init(struct radeon_device *rdev) if (rdev->dummy_page.page == NULL) return -ENOMEM; rdev->dummy_page.addr = dma_map_page(&rdev->pdev->dev, rdev->dummy_page.page,
0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
0, PAGE_SIZE, DMA_BIDIRECTIONAL); if (dma_mapping_error(&rdev->pdev->dev, rdev->dummy_page.addr)) { dev_err(&rdev->pdev->dev, "Failed to DMA MAP the dummy page\n"); __free_page(rdev->dummy_page.page);@@ -808,8 +808,8 @@ void radeon_dummy_page_fini(struct radeon_device *rdev) { if (rdev->dummy_page.page == NULL) return;
pci_unmap_page(rdev->pdev, rdev->dummy_page.addr,PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
dma_unmap_page(&rdev->pdev->dev, rdev->dummy_page.addr, PAGE_SIZE,DMA_BIDIRECTIONAL); __free_page(rdev->dummy_page.page); rdev->dummy_page.page = NULL;
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Christian König -
Christophe JAILLET