scsi: megaraid: Remove pci-dma-compat wrapper APIs.
Subsystems (2)
PATCH RESEND 1/2 scsi: megaraid: Remove pci-dma-compat wrapper APIs.
The legacy API wrappers in include/linux/pci-dma-compat.h should go away as it creates unnecessary midlayering for include/linux/dma-mapping.h APIs, instead use dma-mapping.h APIs directly.
The patch has been generated with the coccinelle script below and has been hand modified to replace GFP_ with correct flags based on the context.
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_consistent_dma_mask(E1, E2)
+ dma_set_coherent_mask(&E1->dev, E2)
@@ expression E1, E2; @@
- pci_set_dma_mask(E1, E2)
+ dma_set_mask(&E1->dev, E2)
--- drivers/scsi/megaraid.c | 66 ++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 30 deletions(-)
drivers/scsi/megaraid.c +36 -30
@@ -133,8 +133,10 @@ mega_setup_mailbox(adapter_t *adapter) {unsigned long align; - adapter->una_mbox64 =pci_alloc_consistent (adapter->dev, -sizeof (mbox64_t), &adapter->una_mbox64_dma); + adapter->una_mbox64 =dma_alloc_coherent (&adapter->dev->dev, +sizeof (mbox64_t), + &adapter->una_mbox64_dma, +GFP_KERNEL );if ( !adapter->una_mbox64 )return -1 ;
@@ -222,8 +224,9 @@ mega_query_adapter(adapter_t *adapter)mraid_inquiry *inq;dma_addr_t dma_handle; - ext_inq =pci_alloc_consistent (adapter->dev, -sizeof (mraid_ext_inquiry), &dma_handle); + ext_inq =dma_alloc_coherent (&adapter->dev->dev, +sizeof (mraid_ext_inquiry), + &dma_handle,GFP_KERNEL );if ( ext_inq ==NULL )return -1 ;
@@ -243,8 +246,9 @@ mega_query_adapter(adapter_t *adapter)mega_8_to_40ld (inq, inquiry3, (mega_product_info *)&adapter->product_info); -pci_free_consistent (adapter->dev,sizeof (mraid_ext_inquiry), - ext_inq, dma_handle); +dma_free_coherent (&adapter->dev->dev, +sizeof (mraid_ext_inquiry), ext_inq, + dma_handle); }else {/*adapter supports 40ld */ adapter->flag |=BOARD_40LD ;
@@ -253,9 +257,9 @@ mega_query_adapter(adapter_t *adapter)* get product_info, which is static information and will be * unchanged */ - prod_info_dma_handle =pci_map_single (adapter->dev, (void *) - &adapter->product_info, -sizeof (mega_product_info),PCI_DMA_FROMDEVICE ); + prod_info_dma_handle =dma_map_single (&adapter->dev->dev, + (void *)&adapter->product_info, +sizeof (mega_product_info),DMA_FROM_DEVICE ); mbox->m_out.xferaddr = prod_info_dma_handle;
@@ -267,8 +271,8 @@ mega_query_adapter(adapter_t *adapter)"Product_info cmd failed with error: %d\n" , retval); -pci_unmap_single (adapter->dev, prod_info_dma_handle, -sizeof (mega_product_info),PCI_DMA_FROMDEVICE ); +dma_unmap_single (&adapter->dev->dev, prod_info_dma_handle, +sizeof (mega_product_info),DMA_FROM_DEVICE ); }
@@ -645,7 +649,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) scb->raw_mbox[2 ] =MEGA_RESERVATION_STATUS ; scb->raw_mbox[3 ] = ldrv_num; - scb->dma_direction =PCI_DMA_NONE ; + scb->dma_direction =DMA_NONE ;return scb;#else
@@ -709,7 +713,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) mbox->m_out.cmd =MEGA_MBOXCMD_PASSTHRU ; } - scb->dma_direction =PCI_DMA_FROMDEVICE ; + scb->dma_direction =DMA_FROM_DEVICE ; pthru->numsgelements =mega_build_sglist (adapter, scb, &pthru->dataxferaddr, &pthru->dataxferlen);
@@ -839,10 +843,10 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy)* If it is a read command */ if ( (*cmd->cmnd &0x0F ) ==0x08 ) { - scb->dma_direction =PCI_DMA_FROMDEVICE ; + scb->dma_direction =DMA_FROM_DEVICE ; }else { - scb->dma_direction =PCI_DMA_TODEVICE ; + scb->dma_direction =DMA_TO_DEVICE ; }/* Calculate Scatter-Gather info */
@@ -877,7 +881,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cmd, int *busy) scb->raw_mbox[3 ] = ldrv_num; - scb->dma_direction =PCI_DMA_NONE ; + scb->dma_direction =DMA_NONE ;return scb;#endif
@@ -971,7 +975,7 @@ mega_prepare_passthru(adapter_t *adapter, scb_t *scb, struct scsi_cmnd *cmd,memcpy (pthru->cdb, cmd->cmnd, cmd->cmd_len);/* Not sure about the direction */ - scb->dma_direction =PCI_DMA_BIDIRECTIONAL ; + scb->dma_direction =DMA_BIDIRECTIONAL ;/* Special Code for Handling READ_CAPA/ INQ using bounce buffers */ switch (cmd->cmnd[0 ]) {
@@ -1035,7 +1039,7 @@ mega_prepare_extpassthru(adapter_t *adapter, scb_t *scb,memcpy (epthru->cdb, cmd->cmnd, cmd->cmd_len);/* Not sure about the direction */ - scb->dma_direction =PCI_DMA_BIDIRECTIONAL ; + scb->dma_direction =DMA_BIDIRECTIONAL ;switch (cmd->cmnd[0 ]) {case INQUIRY :
@@ -1813,25 +1817,25 @@ mega_free_sgl(adapter_t *adapter) scb = &adapter->scb_list[i];if ( scb->sgl64 ) { -pci_free_consistent (adapter->dev, -sizeof (mega_sgl64) * adapter->sglen, - scb->sgl64, - scb->sgl_dma_addr); +dma_free_coherent (&adapter->dev->dev, +sizeof (mega_sgl64) * adapter->sglen, + scb->sgl64, scb->sgl_dma_addr); scb->sgl64 =NULL ; }if ( scb->pthru ) { -pci_free_consistent (adapter->dev,sizeof (mega_passthru), - scb->pthru, scb->pthru_dma_addr); +dma_free_coherent (&adapter->dev->dev, +sizeof (mega_passthru), scb->pthru, + scb->pthru_dma_addr); scb->pthru =NULL ; }if ( scb->epthru ) { -pci_free_consistent (adapter->dev, -sizeof (mega_ext_passthru), - scb->epthru, scb->epthru_dma_addr); +dma_free_coherent (&adapter->dev->dev, +sizeof (mega_ext_passthru), + scb->epthru, scb->epthru_dma_addr); scb->epthru =NULL ; }
@@ -2004,7 +2008,7 @@ make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)memcpy (*pdev, adapter->dev,sizeof (struct pci_dev )); -if (pci_set_dma_mask (*pdev,DMA_BIT_MASK (32 )) !=0 ) { +if (dma_set_mask (&(*pdev)->dev,DMA_BIT_MASK (32 )) !=0 ) {kfree (*pdev);return -1 ; }
@@ -2028,14 +2032,16 @@ free_local_pdev(struct pci_dev *pdev)static inline void *mega_allocate_inquiry (dma_addr_t *dma_handle,struct pci_dev *pdev) { -return pci_alloc_consistent (pdev,sizeof (mega_inquiry3), dma_handle); +return dma_alloc_coherent (&pdev->dev,sizeof (mega_inquiry3), + dma_handle,GFP_KERNEL ); }static inline void mega_free_inquiry (void *inquiry,dma_addr_t dma_handle,struct pci_dev *pdev) { -pci_free_consistent (pdev,sizeof (mega_inquiry3), inquiry, dma_handle); +dma_free_coherent (&pdev->dev,sizeof (mega_inquiry3), inquiry, + dma_handle); }
Signature · 1 line
2.17.1
Hello Suraj!
Quoted 4 lines
The legacy API wrappers in
include/linux/pci-dma-compat.hshould go away as it creates unnecessary midlayering forinclude/linux/dma-mapping.hAPIs, instead usedma-mapping.hAPIs directly.
Instead of all these individual patches, please submit a combined patch series for the changes under SCSI.
Each patch should fix a single driver. Please don't mix changes to completely different drivers such as hpsa and dc395x in a single commit. And please don't split semantically identical changes to the same driver into multiple commits (megaraid [2/2]).
Thank you!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 11 lines · Martin K. Petersen
Hello Suraj!
Quoted 4 lines
The legacy API wrappers in
include/linux/pci-dma-compat.hshould go away as it creates unnecessary midlayering forinclude/linux/dma-mapping.hAPIs, instead usedma-mapping.hAPIs directly.Instead of all these individual patches, please submit a combined patch series for the changes under SCSI.
Quoted 7 lines
Each patch should fix a single driver. Please don't mix changes to completely different drivers such as hpsa and dc395x in a single commit. And please don't split semantically identical changes to the same driver into multiple commits (megaraid [2/2]).
Thank you!
Hii Martin,
Thanks for your response.
I sent a patch series for the above changes.
Thanks,
Suraj Upadhyay
Quoted 2 lines
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering