Commit ba78405e authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Kalle Valo
Browse files

p54: 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 'p54p_probe()', GFP_KERNEL can be used because
it is the probe function and no spin_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 avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200722102707.27486-1-christophe.jaillet@wanadoo.fr
parent 61494648

drivers/net/wireless/intersil/p54/p54pci.c

+35 −30
Original line number Diff line number Diff line
@@ -153,12 +153,12 @@ static void p54p_refill_rx_ring(struct ieee80211_hw *dev, 
			if (!skb)

				break;



			mapping = pci_map_single(priv->pdev,

			mapping = dma_map_single(&priv->pdev->dev,

						 skb_tail_pointer(skb),

						 priv->common.rx_mtu + 32,

						 PCI_DMA_FROMDEVICE);

						 DMA_FROM_DEVICE);



			if (pci_dma_mapping_error(priv->pdev, mapping)) {

			if (dma_mapping_error(&priv->pdev->dev, mapping)) {

				dev_kfree_skb_any(skb);

				dev_err(&priv->pdev->dev,

					"RX DMA Mapping error\n");
@@ -215,19 +215,22 @@ static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index, 
			len = priv->common.rx_mtu;

		}

		dma_addr = le32_to_cpu(desc->host_addr);

		pci_dma_sync_single_for_cpu(priv->pdev, dma_addr,

			priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);

		dma_sync_single_for_cpu(&priv->pdev->dev, dma_addr,

					priv->common.rx_mtu + 32,

					DMA_FROM_DEVICE);

		skb_put(skb, len);



		if (p54_rx(dev, skb)) {

			pci_unmap_single(priv->pdev, dma_addr,

				priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);

			dma_unmap_single(&priv->pdev->dev, dma_addr,

					 priv->common.rx_mtu + 32,

					 DMA_FROM_DEVICE);

			rx_buf[i] = NULL;

			desc->host_addr = cpu_to_le32(0);

		} else {

			skb_trim(skb, 0);

			pci_dma_sync_single_for_device(priv->pdev, dma_addr,

				priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);

			dma_sync_single_for_device(&priv->pdev->dev, dma_addr,

						   priv->common.rx_mtu + 32,

						   DMA_FROM_DEVICE);

			desc->len = cpu_to_le16(priv->common.rx_mtu + 32);

		}
@@ -258,8 +261,9 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index, 
		skb = tx_buf[i];

		tx_buf[i] = NULL;



		pci_unmap_single(priv->pdev, le32_to_cpu(desc->host_addr),

				 le16_to_cpu(desc->len), PCI_DMA_TODEVICE);

		dma_unmap_single(&priv->pdev->dev,

				 le32_to_cpu(desc->host_addr),

				 le16_to_cpu(desc->len), DMA_TO_DEVICE);



		desc->host_addr = 0;

		desc->device_addr = 0;
@@ -334,9 +338,9 @@ static void p54p_tx(struct ieee80211_hw *dev, struct sk_buff *skb) 
	idx = le32_to_cpu(ring_control->host_idx[1]);

	i = idx % ARRAY_SIZE(ring_control->tx_data);



	mapping = pci_map_single(priv->pdev, skb->data, skb->len,

				 PCI_DMA_TODEVICE);

	if (pci_dma_mapping_error(priv->pdev, mapping)) {

	mapping = dma_map_single(&priv->pdev->dev, skb->data, skb->len,

				 DMA_TO_DEVICE);

	if (dma_mapping_error(&priv->pdev->dev, mapping)) {

		spin_unlock_irqrestore(&priv->lock, flags);

		p54_free_skb(dev, skb);

		dev_err(&priv->pdev->dev, "TX DMA mapping error\n");
@@ -378,10 +382,10 @@ static void p54p_stop(struct ieee80211_hw *dev) 
	for (i = 0; i < ARRAY_SIZE(priv->rx_buf_data); i++) {

		desc = &ring_control->rx_data[i];

		if (desc->host_addr)

			pci_unmap_single(priv->pdev,

			dma_unmap_single(&priv->pdev->dev,

					 le32_to_cpu(desc->host_addr),

					 priv->common.rx_mtu + 32,

					 PCI_DMA_FROMDEVICE);

					 DMA_FROM_DEVICE);

		kfree_skb(priv->rx_buf_data[i]);

		priv->rx_buf_data[i] = NULL;

	}
@@ -389,10 +393,10 @@ static void p54p_stop(struct ieee80211_hw *dev) 
	for (i = 0; i < ARRAY_SIZE(priv->rx_buf_mgmt); i++) {

		desc = &ring_control->rx_mgmt[i];

		if (desc->host_addr)

			pci_unmap_single(priv->pdev,

			dma_unmap_single(&priv->pdev->dev,

					 le32_to_cpu(desc->host_addr),

					 priv->common.rx_mtu + 32,

					 PCI_DMA_FROMDEVICE);

					 DMA_FROM_DEVICE);

		kfree_skb(priv->rx_buf_mgmt[i]);

		priv->rx_buf_mgmt[i] = NULL;

	}
@@ -400,10 +404,10 @@ static void p54p_stop(struct ieee80211_hw *dev) 
	for (i = 0; i < ARRAY_SIZE(priv->tx_buf_data); i++) {

		desc = &ring_control->tx_data[i];

		if (desc->host_addr)

			pci_unmap_single(priv->pdev,

			dma_unmap_single(&priv->pdev->dev,

					 le32_to_cpu(desc->host_addr),

					 le16_to_cpu(desc->len),

					 PCI_DMA_TODEVICE);

					 DMA_TO_DEVICE);



		p54_free_skb(dev, priv->tx_buf_data[i]);

		priv->tx_buf_data[i] = NULL;
@@ -412,10 +416,10 @@ static void p54p_stop(struct ieee80211_hw *dev) 
	for (i = 0; i < ARRAY_SIZE(priv->tx_buf_mgmt); i++) {

		desc = &ring_control->tx_mgmt[i];

		if (desc->host_addr)

			pci_unmap_single(priv->pdev,

			dma_unmap_single(&priv->pdev->dev,

					 le32_to_cpu(desc->host_addr),

					 le16_to_cpu(desc->len),

					 PCI_DMA_TODEVICE);

					 DMA_TO_DEVICE);



		p54_free_skb(dev, priv->tx_buf_mgmt[i]);

		priv->tx_buf_mgmt[i] = NULL;
@@ -568,9 +572,9 @@ static int p54p_probe(struct pci_dev *pdev, 
		goto err_disable_dev;

	}



	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

	err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

	if (!err)

		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

	if (err) {

		dev_err(&pdev->dev, "No suitable DMA available\n");

		goto err_free_reg;
@@ -603,8 +607,9 @@ static int p54p_probe(struct pci_dev *pdev, 
		goto err_free_dev;

	}



	priv->ring_control = pci_alloc_consistent(pdev, sizeof(*priv->ring_control),

						  &priv->ring_control_dma);

	priv->ring_control = dma_alloc_coherent(&pdev->dev,

						sizeof(*priv->ring_control),

						&priv->ring_control_dma, GFP_KERNEL);

	if (!priv->ring_control) {

		dev_err(&pdev->dev, "Cannot allocate rings\n");

		err = -ENOMEM;
@@ -623,7 +628,7 @@ static int p54p_probe(struct pci_dev *pdev, 
	if (!err)

		return 0;



	pci_free_consistent(pdev, sizeof(*priv->ring_control),

	dma_free_coherent(&pdev->dev, sizeof(*priv->ring_control),

			  priv->ring_control, priv->ring_control_dma);



 err_iounmap:
@@ -653,7 +658,7 @@ static void p54p_remove(struct pci_dev *pdev) 
	wait_for_completion(&priv->fw_loaded);

	p54_unregister_common(dev);

	release_firmware(priv->firmware);

	pci_free_consistent(pdev, sizeof(*priv->ring_control),

	dma_free_coherent(&pdev->dev, sizeof(*priv->ring_control),

			  priv->ring_control, priv->ring_control_dma);

	iounmap(priv->map);

	pci_release_regions(pdev);