Skip to contentSkip to conversation

crypto: atmel-sha - fix resource management

PATCH Applied Cyrille Pitchen 2 participants 4 messages Feb 5, 2016 – Feb 6, 2016

Subsystems (2)
Crypto API Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

Cyrille Pitchen

author
#0 lore raw

cover crypto: atmel-sha - fix resource management

Hi all,

these two small patches fix resource release and clock management in atomic context.

Best regards,

Cyrille

Cyrille Pitchen (2):
crypto: atmel-sha: fix atmel_sha_remove()
crypto: atmel-sha - remove calls of clk_prepare() from atomic contexts

 drivers/crypto/atmel-sha.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
Signature · 1 line
1.8.2.2
author
#1 lore raw

PATCH 1/2 crypto: atmel-sha: fix atmel_sha_remove()

Since atmel_sha_probe() uses devm_xxx functions to allocate resources, atmel_sha_remove() should no longer explicitly release them.

Signed-off-by Cyrille Pitchen <[email protected]>
Fixes b0e8b3417a62 ("crypto: atmel - use devm_xxx() managed function")
---
 drivers/crypto/atmel-sha.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/crypto/atmel-sha.c +0 -7
index 63b09e01075c..b827c99b17c1 100644
@@ -1611,13 +1611,6 @@ static int atmel_sha_remove(struct platform_device *pdev)
 	if (sha_dd->caps.has_dma)
 		atmel_sha_dma_cleanup(sha_dd);
 
-	iounmap(sha_dd->io_base);
-
-	clk_put(sha_dd->iclk);
-
-	if (sha_dd->irq >= 0)
-		free_irq(sha_dd->irq, sha_dd);
-
 	return 0;
 }
Signature · 1 line
1.8.2.2
author
#2 lore raw

PATCH 2/2 crypto: atmel-sha - remove calls of clk_prepare() from atomic contexts

In reply to Cyrille Pitchen

clk_prepare()/clk_unprepare() must not be called within atomic context.

This patch calls clk_prepare() once for all from atmel_sha_probe() and clk_unprepare() from atmel_sha_remove().

Then calls of clk_prepare_enable()/clk_disable_unprepare() were replaced by calls of clk_enable()/clk_disable().

Signed-off-by Cyrille Pitchen <[email protected]>
Reported-by Matthias Mayr <[email protected]>
---
 drivers/crypto/atmel-sha.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/crypto/atmel-sha.c +13 -5
index b827c99b17c1..f8407dc7dd38 100644
@@ -846,7 +846,7 @@ static void atmel_sha_finish_req(struct ahash_request *req, int err)
 	dd->flags &= ~(SHA_FLAGS_BUSY | SHA_FLAGS_FINAL | SHA_FLAGS_CPU |
 			SHA_FLAGS_DMA_READY | SHA_FLAGS_OUTPUT_READY);
 
-	clk_disable_unprepare(dd->iclk);
+	clk_disable(dd->iclk);
 
 	if (req->base.complete)
 		req->base.complete(&req->base, err);

@@ -859,7 +859,7 @@ static int atmel_sha_hw_init(struct atmel_sha_dev *dd)
 {
 	int err;
 
-	err = clk_prepare_enable(dd->iclk);
+	err = clk_enable(dd->iclk);
 	if (err)
 		return err;
 

@@ -886,7 +886,7 @@ static void atmel_sha_hw_version_init(struct atmel_sha_dev *dd)
 	dev_info(dd->dev,
 			"version: 0x%x\n", dd->hw_version);
 
-	clk_disable_unprepare(dd->iclk);
+	clk_disable(dd->iclk);
 }
 
 static int atmel_sha_handle_queue(struct atmel_sha_dev *dd,

@@ -1536,6 +1536,10 @@ static int atmel_sha_probe(struct platform_device *pdev)
 		goto res_err;
 	}
 
+	err = clk_prepare(sha_dd->iclk);
+	if (err)
+		goto res_err;
+
 	atmel_sha_hw_version_init(sha_dd);
 
 	atmel_sha_get_cap(sha_dd);

@@ -1547,12 +1551,12 @@ static int atmel_sha_probe(struct platform_device *pdev)
 			if (IS_ERR(pdata)) {
 				dev_err(&pdev->dev, "platform data not available\n");
 				err = PTR_ERR(pdata);
-				goto res_err;
+				goto iclk_unprepare;
 			}
 		}
 		if (!pdata->dma_slave) {
 			err = -ENXIO;
-			goto res_err;
+			goto iclk_unprepare;
 		}
 		err = atmel_sha_dma_init(sha_dd, pdata);
 		if (err)

@@ -1583,6 +1587,8 @@ err_algs:
 	if (sha_dd->caps.has_dma)
 		atmel_sha_dma_cleanup(sha_dd);
 err_sha_dma:
+iclk_unprepare:
+	clk_unprepare(sha_dd->iclk);
 res_err:
 	tasklet_kill(&sha_dd->queue_task);
 	tasklet_kill(&sha_dd->done_task);

@@ -1611,6 +1617,8 @@ static int atmel_sha_remove(struct platform_device *pdev)
 	if (sha_dd->caps.has_dma)
 		atmel_sha_dma_cleanup(sha_dd);
 
+	clk_unprepare(sha_dd->iclk);
+
 	return 0;
 }
Signature · 1 line
1.8.2.2
maintainer Applied
#3 lore raw
In reply to Cyrille Pitchen
Quoted 4 lines · Cyrille Pitchen

Hi all,

these two small patches fix resource release and clock management in atomic context.

Applied to crypto.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt