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>
This commit is contained in:
parent
244f8a8029
commit
1e0dd56e96
|
@ -1457,7 +1457,7 @@ static void free_netsgbuf(void *buf)
|
||||||
while (frags--) {
|
while (frags--) {
|
||||||
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
|
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
|
||||||
|
|
||||||
pci_unmap_page((lio->oct_dev)->pci_dev,
|
dma_unmap_page(&lio->oct_dev->pci_dev->dev,
|
||||||
g->sg[(i >> 2)].ptr[(i & 3)],
|
g->sg[(i >> 2)].ptr[(i & 3)],
|
||||||
skb_frag_size(frag), DMA_TO_DEVICE);
|
skb_frag_size(frag), DMA_TO_DEVICE);
|
||||||
i++;
|
i++;
|
||||||
|
@ -1500,7 +1500,7 @@ static void free_netsgbuf_with_resp(void *buf)
|
||||||
while (frags--) {
|
while (frags--) {
|
||||||
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
|
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
|
||||||
|
|
||||||
pci_unmap_page((lio->oct_dev)->pci_dev,
|
dma_unmap_page(&lio->oct_dev->pci_dev->dev,
|
||||||
g->sg[(i >> 2)].ptr[(i & 3)],
|
g->sg[(i >> 2)].ptr[(i & 3)],
|
||||||
skb_frag_size(frag), DMA_TO_DEVICE);
|
skb_frag_size(frag), DMA_TO_DEVICE);
|
||||||
i++;
|
i++;
|
||||||
|
|
|
@ -843,7 +843,7 @@ static void free_netsgbuf(void *buf)
|
||||||
while (frags--) {
|
while (frags--) {
|
||||||
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
|
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
|
||||||
|
|
||||||
pci_unmap_page((lio->oct_dev)->pci_dev,
|
dma_unmap_page(&lio->oct_dev->pci_dev->dev,
|
||||||
g->sg[(i >> 2)].ptr[(i & 3)],
|
g->sg[(i >> 2)].ptr[(i & 3)],
|
||||||
skb_frag_size(frag), DMA_TO_DEVICE);
|
skb_frag_size(frag), DMA_TO_DEVICE);
|
||||||
i++;
|
i++;
|
||||||
|
@ -887,7 +887,7 @@ static void free_netsgbuf_with_resp(void *buf)
|
||||||
while (frags--) {
|
while (frags--) {
|
||||||
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
|
skb_frag_t *frag = &skb_shinfo(skb)->frags[i - 1];
|
||||||
|
|
||||||
pci_unmap_page((lio->oct_dev)->pci_dev,
|
dma_unmap_page(&lio->oct_dev->pci_dev->dev,
|
||||||
g->sg[(i >> 2)].ptr[(i & 3)],
|
g->sg[(i >> 2)].ptr[(i & 3)],
|
||||||
skb_frag_size(frag), DMA_TO_DEVICE);
|
skb_frag_size(frag), DMA_TO_DEVICE);
|
||||||
i++;
|
i++;
|
||||||
|
|
|
@ -1322,18 +1322,12 @@ static int nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
goto err_disable_device;
|
goto err_disable_device;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));
|
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
||||||
if (err) {
|
if (err) {
|
||||||
dev_err(dev, "Unable to get usable DMA configuration\n");
|
dev_err(dev, "Unable to get usable DMA configuration\n");
|
||||||
goto err_release_regions;
|
goto err_release_regions;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
if (err) {
|
|
||||||
dev_err(dev, "Unable to get 48-bit DMA for consistent allocations\n");
|
|
||||||
goto err_release_regions;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* MAP PF's configuration registers */
|
/* MAP PF's configuration registers */
|
||||||
nic->reg_base = pcim_iomap(pdev, PCI_CFG_REG_BAR_NUM, 0);
|
nic->reg_base = pcim_iomap(pdev, PCI_CFG_REG_BAR_NUM, 0);
|
||||||
if (!nic->reg_base) {
|
if (!nic->reg_base) {
|
||||||
|
|
|
@ -2130,18 +2130,12 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||||
goto err_disable_device;
|
goto err_disable_device;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(48));
|
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(48));
|
||||||
if (err) {
|
if (err) {
|
||||||
dev_err(dev, "Unable to get usable DMA configuration\n");
|
dev_err(dev, "Unable to get usable DMA configuration\n");
|
||||||
goto err_release_regions;
|
goto err_release_regions;
|
||||||
}
|
}
|
||||||
|
|
||||||
err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(48));
|
|
||||||
if (err) {
|
|
||||||
dev_err(dev, "unable to get 48-bit DMA for consistent allocations\n");
|
|
||||||
goto err_release_regions;
|
|
||||||
}
|
|
||||||
|
|
||||||
qcount = netif_get_num_default_rss_queues();
|
qcount = netif_get_num_default_rss_queues();
|
||||||
|
|
||||||
/* Restrict multiqset support only for host bound VFs */
|
/* Restrict multiqset support only for host bound VFs */
|
||||||
|
|
Loading…
Reference in New Issue