Commit 1897c5c7 authored Jun 13, 2021 by Christophe JAILLET Committed by Martin K. Petersen Jun 22, 2021

scsi: message: mptfc: 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 'mptfc_GetFcDevPage0()' GFP_KERNEL can be used
because it is already used in this function and no lock is acquired in the
between.

When memory is allocated in 'mptfc_GetFcPortPage0()' and
'mptfc_GetFcPortPage1()' GFP_KERNEL can be used because they already call
'mpt_config()' which has an explicit 'might_sleep()'.

While at it, also remove some useless casting.

@@ @@
-    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)

Link: https://lore.kernel.org/r/95afc589713ade2110e7812159ce3e9ab453ec18.1623568121.git.christophe.jaillet@wanadoo.fr


Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent c7fa2c85

drivers/message/fusion/mptfc.c

+18 −17

Original line number	Diff line number	Diff line
		@@ -331,8 +331,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
		break;

		data_sz = hdr.PageLength * 4;
		ppage0_alloc = pci_alloc_consistent(ioc->pcidev, data_sz,
		&page0_dma);
		ppage0_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,
		&page0_dma, GFP_KERNEL);
		rc = -ENOMEM;
		if (!ppage0_alloc)
		break;
		@@ -367,8 +367,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
		p_p0 = ppage0_alloc; /* save data */
		p_pp0++ = p_p0++; / save addr */
		}
		pci_free_consistent(ioc->pcidev, data_sz,
		(u8 *) ppage0_alloc, page0_dma);
		dma_free_coherent(&ioc->pcidev->dev, data_sz,
		ppage0_alloc, page0_dma);
		if (rc != 0)
		break;

		@@ -763,7 +763,8 @@ mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)

		data_sz = hdr.PageLength * 4;
		rc = -ENOMEM;
		ppage0_alloc = pci_alloc_consistent(ioc->pcidev, data_sz, &page0_dma);
		ppage0_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,
		&page0_dma, GFP_KERNEL);
		if (ppage0_alloc) {

		try_again:
		@@ -817,7 +818,8 @@ mptfc_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)
		mptfc_display_port_link_speed(ioc, portnum, pp0dest);
		}

		pci_free_consistent(ioc->pcidev, data_sz, (u8 *) ppage0_alloc, page0_dma);
		dma_free_coherent(&ioc->pcidev->dev, data_sz, ppage0_alloc,
		page0_dma);
		}

		return rc;
		@@ -904,9 +906,8 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)
		if (data_sz < sizeof(FCPortPage1_t))
		data_sz = sizeof(FCPortPage1_t);

		page1_alloc = pci_alloc_consistent(ioc->pcidev,
		data_sz,
		&page1_dma);
		page1_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,
		&page1_dma, GFP_KERNEL);
		if (!page1_alloc)
		return -ENOMEM;
		}
		@@ -916,7 +917,7 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)
		data_sz = ioc->fc_data.fc_port_page1[portnum].pg_sz;
		if (hdr.PageLength * 4 > data_sz) {
		ioc->fc_data.fc_port_page1[portnum].data = NULL;
		pci_free_consistent(ioc->pcidev, data_sz, (u8 *)
		dma_free_coherent(&ioc->pcidev->dev, data_sz,
		page1_alloc, page1_dma);
		goto start_over;
		}
		@@ -932,8 +933,8 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)
		}
		else {
		ioc->fc_data.fc_port_page1[portnum].data = NULL;
		pci_free_consistent(ioc->pcidev, data_sz, (u8 *)
		page1_alloc, page1_dma);
		dma_free_coherent(&ioc->pcidev->dev, data_sz, page1_alloc,
		page1_dma);
		}

		return rc;
		@@ -1514,9 +1515,9 @@ static void mptfc_remove(struct pci_dev *pdev)

		for (ii=0; ii<ioc->facts.NumberOfPorts; ii++) {
		if (ioc->fc_data.fc_port_page1[ii].data) {
		pci_free_consistent(ioc->pcidev,
		dma_free_coherent(&ioc->pcidev->dev,
		ioc->fc_data.fc_port_page1[ii].pg_sz,
		(u8 *) ioc->fc_data.fc_port_page1[ii].data,
		ioc->fc_data.fc_port_page1[ii].data,
		ioc->fc_data.fc_port_page1[ii].dma);
		ioc->fc_data.fc_port_page1[ii].data = NULL;
		}