From: Lokesh Vutla <lokeshvu...@ti.com>

Some SoCs like omap4/omap5/dra7 contain multiple AES crypto accelerator
cores. Adapt the driver to support this. The driver picks the last used
device from a list of AES devices.

Signed-off-by: Lokesh Vutla <lokeshvu...@ti.com>
[t-kri...@ti.com: forward ported to 4.7 kernel]
Signed-off-by: Tero Kristo <t-kri...@ti.com>
---
 drivers/crypto/omap-aes.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index cf53d3f..f710602 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -319,20 +319,12 @@ static void omap_aes_dma_stop(struct omap_aes_dev *dd)
 
 static struct omap_aes_dev *omap_aes_find_dev(struct omap_aes_ctx *ctx)
 {
-       struct omap_aes_dev *dd = NULL, *tmp;
+       struct omap_aes_dev *dd;
 
        spin_lock_bh(&list_lock);
-       if (!ctx->dd) {
-               list_for_each_entry(tmp, &dev_list, list) {
-                       /* FIXME: take fist available aes core */
-                       dd = tmp;
-                       break;
-               }
-               ctx->dd = dd;
-       } else {
-               /* already found before */
-               dd = ctx->dd;
-       }
+       dd = list_first_entry(&dev_list, struct omap_aes_dev, list);
+       list_move_tail(&dd->list, &dev_list);
+       ctx->dd = dd;
        spin_unlock_bh(&list_lock);
 
        return dd;
@@ -600,7 +592,7 @@ static int omap_aes_prepare_req(struct crypto_engine 
*engine,
 {
        struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx(
                        crypto_ablkcipher_reqtfm(req));
-       struct omap_aes_dev *dd = omap_aes_find_dev(ctx);
+       struct omap_aes_dev *dd = ctx->dd;
        struct omap_aes_reqctx *rctx;
        int len;
 
@@ -644,7 +636,7 @@ static int omap_aes_crypt_req(struct crypto_engine *engine,
 {
        struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx(
                        crypto_ablkcipher_reqtfm(req));
-       struct omap_aes_dev *dd = omap_aes_find_dev(ctx);
+       struct omap_aes_dev *dd = ctx->dd;
 
        if (!dd)
                return -ENODEV;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to