From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-crypto@vger.kernel.org
Cc: "Andrey Smirnov" <andrew.smirnov@gmail.com>,
"Cory Tusar" <cory.tusar@zii.aero>,
"Chris Healy" <cphealy@gmail.com>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Horia Geantă" <horia.geanta@nxp.com>,
"Aymen Sghaier" <aymen.sghaier@nxp.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v6 03/14] crypto: caam - convert caam_jr_init() to use devres
Date: Wed, 17 Jul 2019 08:24:47 -0700 [thread overview]
Message-ID: <20190717152458.22337-4-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190717152458.22337-1-andrew.smirnov@gmail.com>
Use deveres to allocate all of the resources in caam_jr_init() (DMA
coherent and regular memory, IRQs) drop calls to corresponding
deallocation routines. No functional change intended.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
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: linux-crypto@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/crypto/caam/jr.c | 48 ++++++++++++----------------------------
1 file changed, 14 insertions(+), 34 deletions(-)
diff --git a/drivers/crypto/caam/jr.c b/drivers/crypto/caam/jr.c
index 4b25b2fa3d02..ea02f7774f7c 100644
--- a/drivers/crypto/caam/jr.c
+++ b/drivers/crypto/caam/jr.c
@@ -108,25 +108,12 @@ 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;
int ret;
ret = caam_reset_hw_jr(dev);
tasklet_kill(&jrp->irqtask);
- /* Release interrupt */
- free_irq(jrp->irq, 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);
- kfree(jrp->entinfo);
-
return ret;
}
@@ -444,8 +431,8 @@ static int caam_jr_init(struct device *dev)
tasklet_init(&jrp->irqtask, caam_jr_dequeue, (unsigned long)dev);
/* Connect job ring interrupt handler. */
- error = request_irq(jrp->irq, caam_jr_interrupt, IRQF_SHARED,
- dev_name(dev), dev);
+ error = devm_request_irq(dev, jrp->irq, caam_jr_interrupt, IRQF_SHARED,
+ dev_name(dev), dev);
if (error) {
dev_err(dev, "can't connect JobR %d interrupt (%d)\n",
jrp->ridx, jrp->irq);
@@ -454,22 +441,25 @@ static int caam_jr_init(struct device *dev)
error = caam_reset_hw_jr(dev);
if (error)
- goto out_free_irq;
+ goto out_kill_deq;
error = -ENOMEM;
- jrp->inpring = dma_alloc_coherent(dev, sizeof(*jrp->inpring) *
- JOBR_DEPTH, &inpbusaddr, GFP_KERNEL);
+ jrp->inpring = dmam_alloc_coherent(dev, sizeof(*jrp->inpring) *
+ JOBR_DEPTH, &inpbusaddr,
+ GFP_KERNEL);
if (!jrp->inpring)
- goto out_free_irq;
+ goto out_kill_deq;
- 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;
+ goto out_kill_deq;
- jrp->entinfo = kcalloc(JOBR_DEPTH, sizeof(*jrp->entinfo), GFP_KERNEL);
+ jrp->entinfo = devm_kcalloc(dev, JOBR_DEPTH, sizeof(*jrp->entinfo),
+ GFP_KERNEL);
if (!jrp->entinfo)
- goto out_free_outring;
+ goto out_kill_deq;
for (i = 0; i < JOBR_DEPTH; i++)
jrp->entinfo[i].desc_addr_dma = !0;
@@ -494,16 +484,6 @@ static int caam_jr_init(struct device *dev)
(JOBR_INTC_TIME_THLD << JRCFG_ICTT_SHIFT));
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);
- dev_err(dev, "can't allocate job rings for %d\n", jrp->ridx);
-out_free_irq:
- free_irq(jrp->irq, dev);
out_kill_deq:
tasklet_kill(&jrp->irqtask);
return error;
--
2.21.0
next prev parent reply other threads:[~2019-07-17 15:25 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 15:24 [PATCH v6 00/14] crypto: caam - Add i.MX8MQ support Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 01/14] crypto: caam - move DMA mask selection into a function Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 02/14] crypto: caam - simplfy clock initialization Andrey Smirnov
2019-07-23 14:17 ` Horia Geanta
2019-08-12 17:56 ` Andrey Smirnov
2019-07-17 15:24 ` Andrey Smirnov [this message]
2019-07-23 15:48 ` [PATCH v6 03/14] crypto: caam - convert caam_jr_init() to use devres Horia Geanta
2019-07-17 15:24 ` [PATCH v6 04/14] crypto: caam - request JR IRQ as the last step Andrey Smirnov
2019-07-23 16:02 ` Horia Geanta
2019-08-12 17:59 ` Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 05/14] crytpo: caam - make use of iowrite64*_hi_lo in wr_reg64 Andrey Smirnov
2019-07-29 15:29 ` Horia Geanta
2019-07-17 15:24 ` [PATCH v6 06/14] crypto: caam - use ioread64*_hi_lo in rd_reg64 Andrey Smirnov
2019-07-29 15:32 ` Horia Geanta
2019-07-17 15:24 ` [PATCH v6 07/14] crypto: caam - drop 64-bit only wr/rd_reg64() Andrey Smirnov
2019-07-29 15:32 ` Horia Geanta
2019-07-17 15:24 ` [PATCH v6 08/14] crypto: caam - make CAAM_PTR_SZ dynamic Andrey Smirnov
2019-07-23 9:57 ` Horia Geanta
2019-08-12 17:56 ` Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 09/14] crypto: caam - move cpu_to_caam_dma() selection to runtime Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 10/14] crypto: caam - drop explicit usage of struct jr_outentry Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 11/14] crypto: caam - don't hardcode inpentry size Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 12/14] crypto: caam - force DMA address to 32-bit on 64-bit i.MX SoCs Andrey Smirnov
2019-08-05 8:23 ` Horia Geanta
2019-08-12 19:27 ` Andrey Smirnov
2019-08-13 13:38 ` Horia Geanta
2019-08-13 18:50 ` Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 13/14] crypto: caam - always select job ring via RSR on i.MX8MQ Andrey Smirnov
2019-07-17 15:24 ` [PATCH v6 14/14] crypto: caam - add clock entry for i.MX8MQ Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190717152458.22337-4-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=aymen.sghaier@nxp.com \
--cc=cory.tusar@zii.aero \
--cc=cphealy@gmail.com \
--cc=horia.geanta@nxp.com \
--cc=l.stach@pengutronix.de \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).