tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

cavium: 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. It has been
hand modified to use 'dma_set_mask_and_coherent()' instead of
'pci_set_dma_mask()/pci_set_consistent_dma_mask()' when applicable.

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Christophe JAILLET and committed by
David S. Miller 1e0dd56e 244f8a80

+6 -18
+2 -2
drivers/net/ethernet/cavium/liquidio/lio_main.c
··· 1457 1457 while (frags--) { 1458 1458 skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1]; 1459 1459 1460 - pci_unmap_page((lio->oct_dev)->pci_dev, 1460 + dma_unmap_page(&lio->oct_dev->pci_dev->dev, 1461 1461 g->sg[(i >> 2)].ptr[(i & 3)], 1462 1462 skb_frag_size(frag), DMA_TO_DEVICE); 1463 1463 i++; ··· 1500 1500 while (frags--) { 1501 1501 skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1]; 1502 1502 1503 - pci_unmap_page((lio->oct_dev)->pci_dev, 1503 + dma_unmap_page(&lio->oct_dev->pci_dev->dev, 1504 1504 g->sg[(i >> 2)].ptr[(i & 3)], 1505 1505 skb_frag_size(frag), DMA_TO_DEVICE); 1506 1506 i++;
+2 -2
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
··· 843 843 while (frags--) { 844 844 skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1]; 845 845 846 - pci_unmap_page((lio->oct_dev)->pci_dev, 846 + dma_unmap_page(&lio->oct_dev->pci_dev->dev, 847 847 g->sg[(i >> 2)].ptr[(i & 3)], 848 848 skb_frag_size(frag), DMA_TO_DEVICE); 849 849 i++; ··· 887 887 while (frags--) { 888 888 skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1]; 889 889 890 - pci_unmap_page((lio->oct_dev)->pci_dev, 890 + dma_unmap_page(&lio->oct_dev->pci_dev->dev, 891 891 g->sg[(i >> 2)].ptr[(i & 3)], 892 892 skb_frag_size(frag), DMA_TO_DEVICE); 893 893 i++;
+1 -7
drivers/net/ethernet/cavium/thunder/nic_main.c
··· 1322 1322 goto err_disable_device; 1323 1323 } 1324 1324 1325 - err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48)); 1325 + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48)); 1326 1326 if (err) { 1327 1327 dev_err(dev, "Unable to get usable DMA configuration\n"); 1328 - goto err_release_regions; 1329 - } 1330 - 1331 - err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48)); 1332 - if (err) { 1333 - dev_err(dev, "Unable to get 48-bit DMA for consistent allocations\n"); 1334 1328 goto err_release_regions; 1335 1329 } 1336 1330
+1 -7
drivers/net/ethernet/cavium/thunder/nicvf_main.c
··· 2130 2130 goto err_disable_device; 2131 2131 } 2132 2132 2133 - err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48)); 2133 + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48)); 2134 2134 if (err) { 2135 2135 dev_err(dev, "Unable to get usable DMA configuration\n"); 2136 - goto err_release_regions; 2137 - } 2138 - 2139 - err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48)); 2140 - if (err) { 2141 - dev_err(dev, "unable to get 48-bit DMA for consistent allocations\n"); 2142 2136 goto err_release_regions; 2143 2137 } 2144 2138