Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 27 Jul 2020 19:38:26 +0530
From:   Suraj Upadhyay <usuraj35@gmail.com>
To:     kashyap.desai@broadcom.com, sumit.saxena@broadcom.com,
        shivasharan.srikanteshwara@broadcom.com, jejb@linux.ibm.com
Cc:     megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH RESEND 1/2] scsi: megaraid: Remove pci-dma-compat wrapper
 APIs.
Message-ID: <20200727140826.GE14759@blackclown>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="wchHw8dVAp53YPj8"
Content-Disposition: inline
User-Agent: Mutt/1.9.4 (2018-02-28)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--wchHw8dVAp53YPj8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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)

Signed-off-by: Suraj Upadhyay <usuraj35@gmail.com>
---
 drivers/scsi/megaraid.c | 66 ++++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 0484ee52ae80..16bcdffeab37 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -133,8 +133,10 @@ mega_setup_mailbox(adapter_t *adapter)
 {
 	unsigned long	align;
=20
-	adapter->una_mbox64 =3D pci_alloc_consistent(adapter->dev,
-			sizeof(mbox64_t), &adapter->una_mbox64_dma);
+	adapter->una_mbox64 =3D dma_alloc_coherent(&adapter->dev->dev,
+						 sizeof(mbox64_t),
+						 &adapter->una_mbox64_dma,
+						 GFP_KERNEL);
=20
 	if( !adapter->una_mbox64 ) return -1;
 	=09
@@ -222,8 +224,9 @@ mega_query_adapter(adapter_t *adapter)
 		mraid_inquiry		*inq;
 		dma_addr_t		dma_handle;
=20
-		ext_inq =3D pci_alloc_consistent(adapter->dev,
-				sizeof(mraid_ext_inquiry), &dma_handle);
+		ext_inq =3D dma_alloc_coherent(&adapter->dev->dev,
+					     sizeof(mraid_ext_inquiry),
+					     &dma_handle, GFP_KERNEL);
=20
 		if( ext_inq =3D=3D NULL ) return -1;
=20
@@ -243,8 +246,9 @@ mega_query_adapter(adapter_t *adapter)
 		mega_8_to_40ld(inq, inquiry3,
 				(mega_product_info *)&adapter->product_info);
=20
-		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);
=20
 	} else {		/*adapter supports 40ld */
 		adapter->flag |=3D 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 =3D pci_map_single(adapter->dev, (void *)
-				&adapter->product_info,
-				sizeof(mega_product_info), PCI_DMA_FROMDEVICE);
+		prod_info_dma_handle =3D dma_map_single(&adapter->dev->dev,
+						      (void *)&adapter->product_info,
+						      sizeof(mega_product_info), DMA_FROM_DEVICE);
=20
 		mbox->m_out.xferaddr =3D prod_info_dma_handle;
=20
@@ -267,8 +271,8 @@ mega_query_adapter(adapter_t *adapter)
 				"Product_info cmd failed with error: %d\n",
 				retval);
=20
-		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);
 	}
=20
=20
@@ -645,7 +649,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cm=
d, int *busy)
 			scb->raw_mbox[2] =3D MEGA_RESERVATION_STATUS;
 			scb->raw_mbox[3] =3D ldrv_num;
=20
-			scb->dma_direction =3D PCI_DMA_NONE;
+			scb->dma_direction =3D DMA_NONE;
=20
 			return scb;
 #else
@@ -709,7 +713,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cm=
d, int *busy)
 				mbox->m_out.cmd =3D MEGA_MBOXCMD_PASSTHRU;
 			}
=20
-			scb->dma_direction =3D PCI_DMA_FROMDEVICE;
+			scb->dma_direction =3D DMA_FROM_DEVICE;
=20
 			pthru->numsgelements =3D 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) =3D=3D 0x08 ) {
-				scb->dma_direction =3D PCI_DMA_FROMDEVICE;
+				scb->dma_direction =3D DMA_FROM_DEVICE;
 			}
 			else {
-				scb->dma_direction =3D PCI_DMA_TODEVICE;
+				scb->dma_direction =3D DMA_TO_DEVICE;
 			}
=20
 			/* Calculate Scatter-Gather info */
@@ -877,7 +881,7 @@ mega_build_cmd(adapter_t *adapter, struct scsi_cmnd *cm=
d, int *busy)
=20
 			scb->raw_mbox[3] =3D ldrv_num;
=20
-			scb->dma_direction =3D PCI_DMA_NONE;
+			scb->dma_direction =3D DMA_NONE;
=20
 			return scb;
 #endif
@@ -971,7 +975,7 @@ mega_prepare_passthru(adapter_t *adapter, scb_t *scb, s=
truct scsi_cmnd *cmd,
 	memcpy(pthru->cdb, cmd->cmnd, cmd->cmd_len);
=20
 	/* Not sure about the direction */
-	scb->dma_direction =3D PCI_DMA_BIDIRECTIONAL;
+	scb->dma_direction =3D DMA_BIDIRECTIONAL;
=20
 	/* 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 *s=
cb,
 	memcpy(epthru->cdb, cmd->cmnd, cmd->cmd_len);
=20
 	/* Not sure about the direction */
-	scb->dma_direction =3D PCI_DMA_BIDIRECTIONAL;
+	scb->dma_direction =3D DMA_BIDIRECTIONAL;
=20
 	switch(cmd->cmnd[0]) {
 	case INQUIRY:
@@ -1813,25 +1817,25 @@ mega_free_sgl(adapter_t *adapter)
 		scb =3D &adapter->scb_list[i];
=20
 		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);
=20
 			scb->sgl64 =3D NULL;
 		}
=20
 		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);
=20
 			scb->pthru =3D NULL;
 		}
=20
 		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);
=20
 			scb->epthru =3D NULL;
 		}
@@ -2004,7 +2008,7 @@ make_local_pdev(adapter_t *adapter, struct pci_dev **=
pdev)
=20
 	memcpy(*pdev, adapter->dev, sizeof(struct pci_dev));
=20
-	if( pci_set_dma_mask(*pdev, DMA_BIT_MASK(32)) !=3D 0 ) {
+	if(dma_set_mask(&(*pdev)->dev, DMA_BIT_MASK(32)) !=3D 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);
 }
=20
=20
 static inline void
 mega_free_inquiry(void *inquiry, dma_addr_t dma_handle, struct pci_dev *pd=
ev)
 {
-	pci_free_consistent(pdev, sizeof(mega_inquiry3), inquiry, dma_handle);
+	dma_free_coherent(&pdev->dev, sizeof(mega_inquiry3), inquiry,
+			  dma_handle);
 }
=20
=20
--=20
2.17.1


--wchHw8dVAp53YPj8
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEE7AbCa0kOsMJ4cx0j+gRsbIfe744FAl8e39oACgkQ+gRsbIfe
745Z3Q/+M5VTLU/tvNJS6t/DPq35KFblDfBc20P2R9MQQNdQXUd1ygcdJzpoWi8f
KtccK+vdiCUCb54lMI+Vs1rlXgoOFttMWjgao+CWf+7V1RzizcV3UwlkiZ1dXJ1m
eQVIQRr8Hs0tEJrsP2gMSCdDt00laQik5DMDvhNmNjcIx7ez57WnjktnK/rRgZX4
9qElrRV08941bDhY2c30K+kebmMADbdE8vhmvcxsLgOZL0iLWT2b4i3yJNo/HST4
H83zEf4dyhGAhUjfzxfyJf4RymvNVVzmo2pf2kskkeoiye0o8zPf9b7rgNWxtRQR
/4eQjjyBGXeoaYZC4pYPkzYJ7bGLOdxrqn8tTdHVGmAE6YjtMlgFqi+KHunnnQ0E
IUfROWVMYkg5jALinj1rwPukXalAHPFC/OIB8+sRmB+PoSn6gjB+RZjCzbA4B5ac
Hyu/UpljhwQJ0Fs5tt6Ta7S1mujFbtCCpUaa2Nj7c+O8u5YmxoErCi05ltyaza35
kHHDLJLvVtTaST5kfcSQ01hg5xDbSZpb1W6sgJ7gffvfn0kdy9csWTYg6re7ox3J
ZjPmIFFt0y0SXeCVQiRQxe+NrfQffXSuPTIeEqRg6iUMxPgSIfBUnETfDsuAAgZ8
ntRVyUyGYpiV7N8AskbVXJeYYhUchQM1wQ9xv50Q0/6uB1cVuVw=
=Xwt/
-----END PGP SIGNATURE-----

--wchHw8dVAp53YPj8--