Commit a14e3904 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

qlcnic: 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.
This is less verbose.

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb9c5c0d

drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c

+7 −9
Original line number Diff line number Diff line
@@ -94,10 +94,8 @@ void qlcnic_release_rx_buffers(struct qlcnic_adapter *adapter) 
			if (rx_buf->skb == NULL)

				continue;



			pci_unmap_single(adapter->pdev,

					rx_buf->dma,

					rds_ring->dma_size,

					PCI_DMA_FROMDEVICE);

			dma_unmap_single(&adapter->pdev->dev, rx_buf->dma,

					 rds_ring->dma_size, DMA_FROM_DEVICE);



			dev_kfree_skb_any(rx_buf->skb);

		}
@@ -139,16 +137,16 @@ void qlcnic_release_tx_buffers(struct qlcnic_adapter *adapter, 
	for (i = 0; i < tx_ring->num_desc; i++) {

		buffrag = cmd_buf->frag_array;

		if (buffrag->dma) {

			pci_unmap_single(adapter->pdev, buffrag->dma,

					 buffrag->length, PCI_DMA_TODEVICE);

			dma_unmap_single(&adapter->pdev->dev, buffrag->dma,

					 buffrag->length, DMA_TO_DEVICE);

			buffrag->dma = 0ULL;

		}

		for (j = 1; j < cmd_buf->frag_count; j++) {

			buffrag++;

			if (buffrag->dma) {

				pci_unmap_page(adapter->pdev, buffrag->dma,

					       buffrag->length,

					       PCI_DMA_TODEVICE);

				dma_unmap_page(&adapter->pdev->dev,

					       buffrag->dma, buffrag->length,

					       DMA_TO_DEVICE);

				buffrag->dma = 0ULL;

			}

		}

drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c

+16 −16
Original line number Diff line number Diff line
@@ -587,9 +587,9 @@ static int qlcnic_map_tx_skb(struct pci_dev *pdev, struct sk_buff *skb, 
	nr_frags = skb_shinfo(skb)->nr_frags;

	nf = &pbuf->frag_array[0];



	map = pci_map_single(pdev, skb->data, skb_headlen(skb),

			     PCI_DMA_TODEVICE);

	if (pci_dma_mapping_error(pdev, map))

	map = dma_map_single(&pdev->dev, skb->data, skb_headlen(skb),

			     DMA_TO_DEVICE);

	if (dma_mapping_error(&pdev->dev, map))

		goto out_err;



	nf->dma = map;
@@ -612,11 +612,11 @@ static int qlcnic_map_tx_skb(struct pci_dev *pdev, struct sk_buff *skb, 
unwind:

	while (--i >= 0) {

		nf = &pbuf->frag_array[i+1];

		pci_unmap_page(pdev, nf->dma, nf->length, PCI_DMA_TODEVICE);

		dma_unmap_page(&pdev->dev, nf->dma, nf->length, DMA_TO_DEVICE);

	}



	nf = &pbuf->frag_array[0];

	pci_unmap_single(pdev, nf->dma, skb_headlen(skb), PCI_DMA_TODEVICE);

	dma_unmap_single(&pdev->dev, nf->dma, skb_headlen(skb), DMA_TO_DEVICE);



out_err:

	return -ENOMEM;
@@ -630,11 +630,11 @@ static void qlcnic_unmap_buffers(struct pci_dev *pdev, struct sk_buff *skb, 


	for (i = 0; i < nr_frags; i++) {

		nf = &pbuf->frag_array[i+1];

		pci_unmap_page(pdev, nf->dma, nf->length, PCI_DMA_TODEVICE);

		dma_unmap_page(&pdev->dev, nf->dma, nf->length, DMA_TO_DEVICE);

	}



	nf = &pbuf->frag_array[0];

	pci_unmap_single(pdev, nf->dma, skb_headlen(skb), PCI_DMA_TODEVICE);

	dma_unmap_single(&pdev->dev, nf->dma, skb_headlen(skb), DMA_TO_DEVICE);

	pbuf->skb = NULL;

}
@@ -825,10 +825,10 @@ static int qlcnic_alloc_rx_skb(struct qlcnic_adapter *adapter, 
	}



	skb_reserve(skb, NET_IP_ALIGN);

	dma = pci_map_single(pdev, skb->data,

			     rds_ring->dma_size, PCI_DMA_FROMDEVICE);

	dma = dma_map_single(&pdev->dev, skb->data, rds_ring->dma_size,

			     DMA_FROM_DEVICE);



	if (pci_dma_mapping_error(pdev, dma)) {

	if (dma_mapping_error(&pdev->dev, dma)) {

		adapter->stats.rx_dma_map_error++;

		dev_kfree_skb_any(skb);

		return -ENOMEM;
@@ -903,13 +903,13 @@ static int qlcnic_process_cmd_ring(struct qlcnic_adapter *adapter, 
		buffer = &tx_ring->cmd_buf_arr[sw_consumer];

		if (buffer->skb) {

			frag = &buffer->frag_array[0];

			pci_unmap_single(pdev, frag->dma, frag->length,

					 PCI_DMA_TODEVICE);

			dma_unmap_single(&pdev->dev, frag->dma, frag->length,

					 DMA_TO_DEVICE);

			frag->dma = 0ULL;

			for (i = 1; i < buffer->frag_count; i++) {

				frag++;

				pci_unmap_page(pdev, frag->dma, frag->length,

					       PCI_DMA_TODEVICE);

				dma_unmap_page(&pdev->dev, frag->dma,

					       frag->length, DMA_TO_DEVICE);

				frag->dma = 0ULL;

			}

			tx_ring->tx_stats.xmit_finished++;
@@ -1147,8 +1147,8 @@ static struct sk_buff *qlcnic_process_rxbuf(struct qlcnic_adapter *adapter, 
		return NULL;

	}



	pci_unmap_single(adapter->pdev, buffer->dma, ring->dma_size,

			 PCI_DMA_FROMDEVICE);

	dma_unmap_single(&adapter->pdev->dev, buffer->dma, ring->dma_size,

			 DMA_FROM_DEVICE);



	skb = buffer->skb;

	if (likely((adapter->netdev->features & NETIF_F_RXCSUM) &&

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+2 −4
Original line number Diff line number Diff line
@@ -2343,11 +2343,9 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev, 


static int qlcnic_set_dma_mask(struct pci_dev *pdev, int *pci_using_dac)

{

	if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) &&

			!pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))

	if (!dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)))

		*pci_using_dac = 1;

	else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) &&

			!pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))

	else if (!dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)))

		*pci_using_dac = 0;

	else {

		dev_err(&pdev->dev, "Unable to set DMA mask, aborting\n");