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

natsemi: 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 'alloc_ring()' (natsemi.c) GFP_KERNEL can be
used because it is only called from 'netdev_open()', which is a '.ndo_open'
function. Such function are synchronized with the rtnl_lock() semaphore.

When memory is allocated in 'ns83820_init_one()' (ns83820.c) GFP_KERNEL can
be used because it is a 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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3f4bc34c

drivers/net/ethernet/natsemi/natsemi.c

+31 −32
Original line number Diff line number Diff line
@@ -1916,9 +1916,9 @@ static void ns_tx_timeout(struct net_device *dev, unsigned int txqueue) 
static int alloc_ring(struct net_device *dev)

{

	struct netdev_private *np = netdev_priv(dev);

	np->rx_ring = pci_alloc_consistent(np->pci_dev,

	np->rx_ring = dma_alloc_coherent(&np->pci_dev->dev,

					 sizeof(struct netdev_desc) * (RX_RING_SIZE + TX_RING_SIZE),

		&np->ring_dma);

					 &np->ring_dma, GFP_KERNEL);

	if (!np->rx_ring)

		return -ENOMEM;

	np->tx_ring = &np->rx_ring[RX_RING_SIZE];
@@ -1939,10 +1939,10 @@ static void refill_rx(struct net_device *dev) 
			np->rx_skbuff[entry] = skb;

			if (skb == NULL)

				break; /* Better luck next round. */

			np->rx_dma[entry] = pci_map_single(np->pci_dev,

				skb->data, buflen, PCI_DMA_FROMDEVICE);

			if (pci_dma_mapping_error(np->pci_dev,

						  np->rx_dma[entry])) {

			np->rx_dma[entry] = dma_map_single(&np->pci_dev->dev,

							   skb->data, buflen,

							   DMA_FROM_DEVICE);

			if (dma_mapping_error(&np->pci_dev->dev, np->rx_dma[entry])) {

				dev_kfree_skb_any(skb);

				np->rx_skbuff[entry] = NULL;

				break; /* Better luck next round. */
@@ -2013,9 +2013,8 @@ static void drain_tx(struct net_device *dev) 


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

		if (np->tx_skbuff[i]) {

			pci_unmap_single(np->pci_dev,

				np->tx_dma[i], np->tx_skbuff[i]->len,

				PCI_DMA_TODEVICE);

			dma_unmap_single(&np->pci_dev->dev, np->tx_dma[i],

					 np->tx_skbuff[i]->len, DMA_TO_DEVICE);

			dev_kfree_skb(np->tx_skbuff[i]);

			dev->stats.tx_dropped++;

		}
@@ -2034,9 +2033,9 @@ static void drain_rx(struct net_device *dev) 
		np->rx_ring[i].cmd_status = 0;

		np->rx_ring[i].addr = cpu_to_le32(0xBADF00D0); /* An invalid address. */

		if (np->rx_skbuff[i]) {

			pci_unmap_single(np->pci_dev, np->rx_dma[i],

			dma_unmap_single(&np->pci_dev->dev, np->rx_dma[i],

					 buflen + NATSEMI_PADDING,

				PCI_DMA_FROMDEVICE);

					 DMA_FROM_DEVICE);

			dev_kfree_skb(np->rx_skbuff[i]);

		}

		np->rx_skbuff[i] = NULL;
@@ -2052,7 +2051,7 @@ static void drain_ring(struct net_device *dev) 
static void free_ring(struct net_device *dev)

{

	struct netdev_private *np = netdev_priv(dev);

	pci_free_consistent(np->pci_dev,

	dma_free_coherent(&np->pci_dev->dev,

			  sizeof(struct netdev_desc) * (RX_RING_SIZE + TX_RING_SIZE),

			  np->rx_ring, np->ring_dma);

}
@@ -2101,9 +2100,9 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) 
	entry = np->cur_tx % TX_RING_SIZE;



	np->tx_skbuff[entry] = skb;

	np->tx_dma[entry] = pci_map_single(np->pci_dev,

				skb->data,skb->len, PCI_DMA_TODEVICE);

	if (pci_dma_mapping_error(np->pci_dev, np->tx_dma[entry])) {

	np->tx_dma[entry] = dma_map_single(&np->pci_dev->dev, skb->data,

					   skb->len, DMA_TO_DEVICE);

	if (dma_mapping_error(&np->pci_dev->dev, np->tx_dma[entry])) {

		np->tx_skbuff[entry] = NULL;

		dev_kfree_skb_irq(skb);

		dev->stats.tx_dropped++;
@@ -2169,9 +2168,8 @@ static void netdev_tx_done(struct net_device *dev) 
				dev->stats.tx_window_errors++;

			dev->stats.tx_errors++;

		}

		pci_unmap_single(np->pci_dev,np->tx_dma[entry],

					np->tx_skbuff[entry]->len,

					PCI_DMA_TODEVICE);

		dma_unmap_single(&np->pci_dev->dev, np->tx_dma[entry],

				 np->tx_skbuff[entry]->len, DMA_TO_DEVICE);

		/* Free the original skb. */

		dev_consume_skb_irq(np->tx_skbuff[entry]);

		np->tx_skbuff[entry] = NULL;
@@ -2359,21 +2357,22 @@ static void netdev_rx(struct net_device *dev, int *work_done, int work_to_do) 
			    (skb = netdev_alloc_skb(dev, pkt_len + RX_OFFSET)) != NULL) {

				/* 16 byte align the IP header */

				skb_reserve(skb, RX_OFFSET);

				pci_dma_sync_single_for_cpu(np->pci_dev,

				dma_sync_single_for_cpu(&np->pci_dev->dev,

							np->rx_dma[entry],

							buflen,

					PCI_DMA_FROMDEVICE);

							DMA_FROM_DEVICE);

				skb_copy_to_linear_data(skb,

					np->rx_skbuff[entry]->data, pkt_len);

				skb_put(skb, pkt_len);

				pci_dma_sync_single_for_device(np->pci_dev,

				dma_sync_single_for_device(&np->pci_dev->dev,

							   np->rx_dma[entry],

							   buflen,

					PCI_DMA_FROMDEVICE);

							   DMA_FROM_DEVICE);

			} else {

				pci_unmap_single(np->pci_dev, np->rx_dma[entry],

				dma_unmap_single(&np->pci_dev->dev,

						 np->rx_dma[entry],

						 buflen + NATSEMI_PADDING,

						 PCI_DMA_FROMDEVICE);

						 DMA_FROM_DEVICE);

				skb_put(skb = np->rx_skbuff[entry], pkt_len);

				np->rx_skbuff[entry] = NULL;

			}

drivers/net/ethernet/natsemi/ns83820.c

+31 −30
Original line number Diff line number Diff line
@@ -526,8 +526,8 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb) 


	dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC;

	cmdsts = REAL_RX_BUF_SIZE | CMDSTS_INTR;

	buf = pci_map_single(dev->pci_dev, skb->data,

			     REAL_RX_BUF_SIZE, PCI_DMA_FROMDEVICE);

	buf = dma_map_single(&dev->pci_dev->dev, skb->data, REAL_RX_BUF_SIZE,

			     DMA_FROM_DEVICE);

	build_rx_desc(dev, sg, 0, buf, cmdsts, 0);

	/* update link of previous rx */

	if (likely(next_empty != dev->rx_info.next_rx))
@@ -858,8 +858,8 @@ static void rx_irq(struct net_device *ndev) 
		mb();

		clear_rx_desc(dev, next_rx);



		pci_unmap_single(dev->pci_dev, bufptr,

				 RX_BUF_SIZE, PCI_DMA_FROMDEVICE);

		dma_unmap_single(&dev->pci_dev->dev, bufptr, RX_BUF_SIZE,

				 DMA_FROM_DEVICE);

		len = cmdsts & CMDSTS_LEN_MASK;

#ifdef NS83820_VLAN_ACCEL_SUPPORT

		/* NH: As was mentioned below, this chip is kinda
@@ -985,17 +985,13 @@ static void do_tx_done(struct net_device *ndev) 
		len = cmdsts & CMDSTS_LEN_MASK;

		addr = desc_addr_get(desc + DESC_BUFPTR);

		if (skb) {

			pci_unmap_single(dev->pci_dev,

					addr,

					len,

					PCI_DMA_TODEVICE);

			dma_unmap_single(&dev->pci_dev->dev, addr, len,

					 DMA_TO_DEVICE);

			dev_consume_skb_irq(skb);

			atomic_dec(&dev->nr_tx_skbs);

		} else

			pci_unmap_page(dev->pci_dev,

					addr,

					len,

					PCI_DMA_TODEVICE);

			dma_unmap_page(&dev->pci_dev->dev, addr, len,

				       DMA_TO_DEVICE);



		tx_done_idx = (tx_done_idx + 1) % NR_TX_DESC;

		dev->tx_done_idx = tx_done_idx;
@@ -1023,10 +1019,10 @@ static void ns83820_cleanup_tx(struct ns83820 *dev) 
		dev->tx_skbs[i] = NULL;

		if (skb) {

			__le32 *desc = dev->tx_descs + (i * DESC_SIZE);

			pci_unmap_single(dev->pci_dev,

			dma_unmap_single(&dev->pci_dev->dev,

					 desc_addr_get(desc + DESC_BUFPTR),

					 le32_to_cpu(desc[DESC_CMDSTS]) & CMDSTS_LEN_MASK,

					PCI_DMA_TODEVICE);

					 DMA_TO_DEVICE);

			dev_kfree_skb_irq(skb);

			atomic_dec(&dev->nr_tx_skbs);

		}
@@ -1121,7 +1117,8 @@ again: 
	len = skb->len;

	if (nr_frags)

		len -= skb->data_len;

	buf = pci_map_single(dev->pci_dev, skb->data, len, PCI_DMA_TODEVICE);

	buf = dma_map_single(&dev->pci_dev->dev, skb->data, len,

			     DMA_TO_DEVICE);



	first_desc = dev->tx_descs + (free_idx * DESC_SIZE);
@@ -1902,12 +1899,12 @@ static int ns83820_init_one(struct pci_dev *pci_dev, 


	/* See if we can set the dma mask early on; failure is fatal. */

	if (sizeof(dma_addr_t) == 8 &&

		!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) {

		!dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64))) {

		using_dac = 1;

	} else if (!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {

	} else if (!dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) {

		using_dac = 0;

	} else {

		dev_warn(&pci_dev->dev, "pci_set_dma_mask failed!\n");

		dev_warn(&pci_dev->dev, "dma_set_mask failed!\n");

		return -ENODEV;

	}
@@ -1938,10 +1935,12 @@ static int ns83820_init_one(struct pci_dev *pci_dev, 
	pci_set_master(pci_dev);

	addr = pci_resource_start(pci_dev, 1);

	dev->base = ioremap(addr, PAGE_SIZE);

	dev->tx_descs = pci_alloc_consistent(pci_dev,

			4 * DESC_SIZE * NR_TX_DESC, &dev->tx_phy_descs);

	dev->rx_info.descs = pci_alloc_consistent(pci_dev,

			4 * DESC_SIZE * NR_RX_DESC, &dev->rx_info.phy_descs);

	dev->tx_descs = dma_alloc_coherent(&pci_dev->dev,

					   4 * DESC_SIZE * NR_TX_DESC,

					   &dev->tx_phy_descs, GFP_KERNEL);

	dev->rx_info.descs = dma_alloc_coherent(&pci_dev->dev,

						4 * DESC_SIZE * NR_RX_DESC,

						&dev->rx_info.phy_descs, GFP_KERNEL);

	err = -ENOMEM;

	if (!dev->base || !dev->tx_descs || !dev->rx_info.descs)

		goto out_disable;
@@ -2183,8 +2182,10 @@ out_free_irq: 
out_disable:

	if (dev->base)

		iounmap(dev->base);

	pci_free_consistent(pci_dev, 4 * DESC_SIZE * NR_TX_DESC, dev->tx_descs, dev->tx_phy_descs);

	pci_free_consistent(pci_dev, 4 * DESC_SIZE * NR_RX_DESC, dev->rx_info.descs, dev->rx_info.phy_descs);

	dma_free_coherent(&pci_dev->dev, 4 * DESC_SIZE * NR_TX_DESC,

			  dev->tx_descs, dev->tx_phy_descs);

	dma_free_coherent(&pci_dev->dev, 4 * DESC_SIZE * NR_RX_DESC,

			  dev->rx_info.descs, dev->rx_info.phy_descs);

	pci_disable_device(pci_dev);

out_free:

	free_netdev(ndev);
@@ -2205,9 +2206,9 @@ static void ns83820_remove_one(struct pci_dev *pci_dev) 
	unregister_netdev(ndev);

	free_irq(dev->pci_dev->irq, ndev);

	iounmap(dev->base);

	pci_free_consistent(dev->pci_dev, 4 * DESC_SIZE * NR_TX_DESC,

	dma_free_coherent(&dev->pci_dev->dev, 4 * DESC_SIZE * NR_TX_DESC,

			  dev->tx_descs, dev->tx_phy_descs);

	pci_free_consistent(dev->pci_dev, 4 * DESC_SIZE * NR_RX_DESC,

	dma_free_coherent(&dev->pci_dev->dev, 4 * DESC_SIZE * NR_RX_DESC,

			  dev->rx_info.descs, dev->rx_info.phy_descs);

	pci_disable_device(dev->pci_dev);

	free_netdev(ndev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE