From: Joel Fernandes <joelf@ti.com>
To: Herbert Xu <herbert@gondor.hengli.com.au>,
"David S. Miller" <davem@davemloft.net>,
Mark Greer <mgreer@animalcreek.com>,
Tony Lindgren <tony@atomide.com>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
Rajendra Nayak <rnayak@ti.com>, Lokesh Vutla <lokeshvutla@ti.com>
Cc: Linux OMAP List <linux-omap@vger.kernel.org>,
Linux ARM Kernel List <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Crypto Mailing List <linux-crypto@vger.kernel.org>,
Joel Fernandes <joelf@ti.com>
Subject: [PATCH v2 10/14] crypto: omap-aes: Switch to PIO mode during probe
Date: Sat, 17 Aug 2013 21:42:31 -0500 [thread overview]
Message-ID: <1376793755-30478-11-git-send-email-joelf@ti.com> (raw)
In-Reply-To: <1376793755-30478-1-git-send-email-joelf@ti.com>
In cases where requesting for DMA channels fails for some reason, or channel
numbers are not provided in DT or platform data, we switch to PIO-only mode
also checking if platform provides IRQ numbers and interrupt register offsets
in DT and platform data. All dma-only paths are avoided in this mode.
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
drivers/crypto/omap-aes.c | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 62b3260..d214dbf 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -1064,7 +1064,7 @@ static int omap_aes_probe(struct platform_device *pdev)
struct omap_aes_dev *dd;
struct crypto_alg *algp;
struct resource res;
- int err = -ENOMEM, i, j;
+ int err = -ENOMEM, i, j, irq = -1;
u32 reg;
dd = kzalloc(sizeof(struct omap_aes_dev), GFP_KERNEL);
@@ -1108,8 +1108,23 @@ static int omap_aes_probe(struct platform_device *pdev)
tasklet_init(&dd->queue_task, omap_aes_queue_task, (unsigned long)dd);
err = omap_aes_dma_init(dd);
- if (err)
- goto err_dma;
+ if (err && AES_REG_IRQ_STATUS(dd) && AES_REG_IRQ_ENABLE(dd)) {
+ dd->pio_only = 1;
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0) {
+ dev_err(dev, "can't get IRQ resource\n");
+ goto err_irq;
+ }
+
+ err = request_irq(irq, omap_aes_irq, 0,
+ dev_name(dev), dd);
+ if (err) {
+ dev_err(dev, "Unable to grab omap-aes IRQ\n");
+ goto err_irq;
+ }
+ }
+
INIT_LIST_HEAD(&dd->list);
spin_lock(&list_lock);
@@ -1137,8 +1152,11 @@ err_algs:
for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--)
crypto_unregister_alg(
&dd->pdata->algs_info[i].algs_list[j]);
- omap_aes_dma_cleanup(dd);
-err_dma:
+ if (dd->pio_only)
+ free_irq(irq, dd);
+ else
+ omap_aes_dma_cleanup(dd);
+err_irq:
tasklet_kill(&dd->done_task);
tasklet_kill(&dd->queue_task);
pm_runtime_disable(dev);
--
1.7.9.5
next prev parent reply other threads:[~2013-08-18 2:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-18 2:42 [PATCH v2 00/14] crypto: omap-aes: Improve DMA, add PIO mode and support for AM437x Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 01/14] crypto: scatterwalk: Add support for calculating number of SG elements Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 02/14] crypto: omap-aes: Add useful debug macros Joel Fernandes
2013-08-18 4:22 ` Joe Perches
2013-08-18 5:56 ` Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 03/14] crypto: omap-aes: Populate number of SG elements Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 04/14] crypto: omap-aes: Simplify DMA usage by using direct SGs Joel Fernandes
2013-08-20 12:57 ` Lokesh Vutla
2013-08-21 0:54 ` Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 05/14] crypto: omap-aes: Sync SG before DMA operation Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 06/14] crypto: omap-aes: Remove previously used intermediate buffers Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 07/14] crypto: omap-aes: Add IRQ info and helper macros Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 08/14] crypto: omap-aes: PIO mode: Add IRQ handler and walk SGs Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 09/14] crypto: omap-aes: PIO mode: platform data for OMAP4/AM437x and trigger Joel Fernandes
2013-08-18 2:42 ` Joel Fernandes [this message]
2013-08-18 2:42 ` [PATCH v2 11/14] crypto: omap-aes: Add support for cases of unaligned lengths Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 12/14] crypto: omap-aes: Convert kzalloc to devm_kzalloc Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 13/14] crypto: omap-aes: Convert request_irq to devm_request_irq Joel Fernandes
2013-08-18 2:42 ` [PATCH v2 14/14] crypto: omap-aes: Kconfig: Add build support for AM437x Joel Fernandes
2013-08-21 11:50 ` [PATCH v2 00/14] crypto: omap-aes: Improve DMA, add PIO mode and " Herbert Xu
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=1376793755-30478-11-git-send-email-joelf@ti.com \
--to=joelf@ti.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.hengli.com.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lokeshvutla@ti.com \
--cc=mgreer@animalcreek.com \
--cc=rnayak@ti.com \
--cc=santosh.shilimkar@ti.com \
--cc=tony@atomide.com \
/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