diff mbox series

[v4,05/16] crypto: caam - use devres to allocate 'outring'

Message ID 20190703081327.17505-6-andrew.smirnov@gmail.com (mailing list archive)
State Superseded
Delegated to: Herbert Xu
Headers show
Series crypto: caam - Add i.MX8MQ support | expand

Commit Message

Andrey Smirnov July 3, 2019, 8:13 a.m. UTC 
Use devres to allocate 'outring' and drop corresponding call to
dma_free_coherent() as well as extra references to 'struct
jr_outentry' (needed in following commits). No functional change
inteded.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Spencer <christopher.spencer@sea.co.uk>
Cc: Cory Tusar <cory.tusar@zii.aero>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Horia Geantă <horia.geanta@nxp.com>
Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/crypto/caam/jr.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

Comments

Horia Geanta July 4, 2019, 9:54 a.m. UTC | #1 
On 7/3/2019 11:14 AM, Andrey Smirnov wrote:
> Use devres to allocate 'outring' and drop corresponding call to
> dma_free_coherent() as well as extra references to 'struct
> jr_outentry' (needed in following commits). No functional change
> inteded.
> 
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> Cc: Chris Spencer <christopher.spencer@sea.co.uk>
> Cc: Cory Tusar <cory.tusar@zii.aero>
> Cc: Chris Healy <cphealy@gmail.com>
> Cc: Lucas Stach <l.stach@pengutronix.de>
> Cc: Horia Geantă <horia.geanta@nxp.com>
> Cc: Aymen Sghaier <aymen.sghaier@nxp.com>
> Cc: Leonard Crestez <leonard.crestez@nxp.com>
> Cc: linux-crypto@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/crypto/caam/jr.c | 15 +++++----------
>  1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
> index fc7deb445aa8..1eaa91dcc146 100644
> --- a/drivers/crypto/caam/jr.c
> +++ b/drivers/crypto/caam/jr.c
> @@ -108,7 +108,7 @@ static int caam_reset_hw_jr(struct device *dev)
>  static int caam_jr_shutdown(struct device *dev)
>  {
>  	struct caam_drv_private_jr *jrp = dev_get_drvdata(dev);
> -	dma_addr_t inpbusaddr, outbusaddr;
> +	dma_addr_t inpbusaddr;
>  	int ret;
>  
>  	ret = caam_reset_hw_jr(dev);
> @@ -120,11 +120,8 @@ static int caam_jr_shutdown(struct device *dev)
>  
>  	/* Free rings */
>  	inpbusaddr = rd_reg64(&jrp->rregs->inpring_base);
> -	outbusaddr = rd_reg64(&jrp->rregs->outring_base);
>  	dma_free_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH,
>  			  jrp->inpring, inpbusaddr);
> -	dma_free_coherent(dev, sizeof(struct jr_outentry) * JOBR_DEPTH,
> -			  jrp->outring, outbusaddr);
>  
>  	return ret;
>  }
> @@ -459,15 +456,16 @@ static int caam_jr_init(struct device *dev)
>  	if (!jrp->inpring)
>  		goto out_free_irq;
>  
> -	jrp->outring = dma_alloc_coherent(dev, sizeof(*jrp->outring) *
> -					  JOBR_DEPTH, &outbusaddr, GFP_KERNEL);
> +	jrp->outring = dmam_alloc_coherent(dev, sizeof(*jrp->outring) *
> +					   JOBR_DEPTH, &outbusaddr,
> +					   GFP_KERNEL);
>  	if (!jrp->outring)
>  		goto out_free_inpring;
>  
>  	jrp->entinfo = devm_kcalloc(dev, JOBR_DEPTH, sizeof(*jrp->entinfo),
>  				    GFP_KERNEL);
>  	if (!jrp->entinfo)
> -		goto out_free_outring;
> +		return -ENOMEM;
>  
This is going to leak resources, so should instead be:
		goto out_free_inpring;

I suggest merging patches 4, 5, 6.
They have the same goal, are rather small and make changes in the same places,
and would avoid issues like this one.

>  	tasklet_init(&jrp->irqtask, caam_jr_dequeue, (unsigned long)dev);
>  
> @@ -495,9 +493,6 @@ static int caam_jr_init(struct device *dev)
>  
>  	return 0;
>  
> -out_free_outring:
> -	dma_free_coherent(dev, sizeof(struct jr_outentry) * JOBR_DEPTH,
> -			  jrp->outring, outbusaddr);
>  out_free_inpring:
>  	dma_free_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH,
>  			  jrp->inpring, inpbusaddr);
>
diff mbox series

Patch

diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index fc7deb445aa8..1eaa91dcc146 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -108,7 +108,7 @@  static int caam_reset_hw_jr(struct device *dev)
 static int caam_jr_shutdown(struct device *dev)
 {
 	struct caam_drv_private_jr *jrp = dev_get_drvdata(dev);
-	dma_addr_t inpbusaddr, outbusaddr;
+	dma_addr_t inpbusaddr;
 	int ret;
 
 	ret = caam_reset_hw_jr(dev);
@@ -120,11 +120,8 @@  static int caam_jr_shutdown(struct device *dev)
 
 	/* Free rings */
 	inpbusaddr = rd_reg64(&jrp->rregs->inpring_base);
-	outbusaddr = rd_reg64(&jrp->rregs->outring_base);
 	dma_free_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH,
 			  jrp->inpring, inpbusaddr);
-	dma_free_coherent(dev, sizeof(struct jr_outentry) * JOBR_DEPTH,
-			  jrp->outring, outbusaddr);
 
 	return ret;
 }
@@ -459,15 +456,16 @@  static int caam_jr_init(struct device *dev)
 	if (!jrp->inpring)
 		goto out_free_irq;
 
-	jrp->outring = dma_alloc_coherent(dev, sizeof(*jrp->outring) *
-					  JOBR_DEPTH, &outbusaddr, GFP_KERNEL);
+	jrp->outring = dmam_alloc_coherent(dev, sizeof(*jrp->outring) *
+					   JOBR_DEPTH, &outbusaddr,
+					   GFP_KERNEL);
 	if (!jrp->outring)
 		goto out_free_inpring;
 
 	jrp->entinfo = devm_kcalloc(dev, JOBR_DEPTH, sizeof(*jrp->entinfo),
 				    GFP_KERNEL);
 	if (!jrp->entinfo)
-		goto out_free_outring;
+		return -ENOMEM;
 
 	tasklet_init(&jrp->irqtask, caam_jr_dequeue, (unsigned long)dev);
 
@@ -495,9 +493,6 @@  static int caam_jr_init(struct device *dev)
 
 	return 0;
 
-out_free_outring:
-	dma_free_coherent(dev, sizeof(struct jr_outentry) * JOBR_DEPTH,
-			  jrp->outring, outbusaddr);
 out_free_inpring:
 	dma_free_coherent(dev, sizeof(dma_addr_t) * JOBR_DEPTH,
 			  jrp->inpring, inpbusaddr);