Skip to content

Commit 1897c5c

Browse files
tititiou36martinkpetersen
authored andcommitted
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>
1 parent c7fa2c8 commit 1897c5c

1 file changed

Lines changed: 18 additions & 17 deletions

File tree

drivers/message/fusion/mptfc.c

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
331331
break;
332332

333333
data_sz = hdr.PageLength * 4;
334-
ppage0_alloc = pci_alloc_consistent(ioc->pcidev, data_sz,
335-
&page0_dma);
334+
ppage0_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,
335+
&page0_dma, GFP_KERNEL);
336336
rc = -ENOMEM;
337337
if (!ppage0_alloc)
338338
break;
@@ -367,8 +367,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
367367
*p_p0 = *ppage0_alloc; /* save data */
368368
*p_pp0++ = p_p0++; /* save addr */
369369
}
370-
pci_free_consistent(ioc->pcidev, data_sz,
371-
(u8 *) ppage0_alloc, page0_dma);
370+
dma_free_coherent(&ioc->pcidev->dev, data_sz,
371+
ppage0_alloc, page0_dma);
372372
if (rc != 0)
373373
break;
374374

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

764764
data_sz = hdr.PageLength * 4;
765765
rc = -ENOMEM;
766-
ppage0_alloc = pci_alloc_consistent(ioc->pcidev, data_sz, &page0_dma);
766+
ppage0_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,
767+
&page0_dma, GFP_KERNEL);
767768
if (ppage0_alloc) {
768769

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

820-
pci_free_consistent(ioc->pcidev, data_sz, (u8 *) ppage0_alloc, page0_dma);
821+
dma_free_coherent(&ioc->pcidev->dev, data_sz, ppage0_alloc,
822+
page0_dma);
821823
}
822824

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

907-
page1_alloc = pci_alloc_consistent(ioc->pcidev,
908-
data_sz,
909-
&page1_dma);
909+
page1_alloc = dma_alloc_coherent(&ioc->pcidev->dev, data_sz,
910+
&page1_dma, GFP_KERNEL);
910911
if (!page1_alloc)
911912
return -ENOMEM;
912913
}
@@ -916,8 +917,8 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)
916917
data_sz = ioc->fc_data.fc_port_page1[portnum].pg_sz;
917918
if (hdr.PageLength * 4 > data_sz) {
918919
ioc->fc_data.fc_port_page1[portnum].data = NULL;
919-
pci_free_consistent(ioc->pcidev, data_sz, (u8 *)
920-
page1_alloc, page1_dma);
920+
dma_free_coherent(&ioc->pcidev->dev, data_sz,
921+
page1_alloc, page1_dma);
921922
goto start_over;
922923
}
923924
}
@@ -932,8 +933,8 @@ mptfc_GetFcPortPage1(MPT_ADAPTER *ioc, int portnum)
932933
}
933934
else {
934935
ioc->fc_data.fc_port_page1[portnum].data = NULL;
935-
pci_free_consistent(ioc->pcidev, data_sz, (u8 *)
936-
page1_alloc, page1_dma);
936+
dma_free_coherent(&ioc->pcidev->dev, data_sz, page1_alloc,
937+
page1_dma);
937938
}
938939

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

15151516
for (ii=0; ii<ioc->facts.NumberOfPorts; ii++) {
15161517
if (ioc->fc_data.fc_port_page1[ii].data) {
1517-
pci_free_consistent(ioc->pcidev,
1518-
ioc->fc_data.fc_port_page1[ii].pg_sz,
1519-
(u8 *) ioc->fc_data.fc_port_page1[ii].data,
1520-
ioc->fc_data.fc_port_page1[ii].dma);
1518+
dma_free_coherent(&ioc->pcidev->dev,
1519+
ioc->fc_data.fc_port_page1[ii].pg_sz,
1520+
ioc->fc_data.fc_port_page1[ii].data,
1521+
ioc->fc_data.fc_port_page1[ii].dma);
15211522
ioc->fc_data.fc_port_page1[ii].data = NULL;
15221523
}
15231524
}

0 commit comments

Comments
 (0)