[PATCH v3 09/10] crypto: caam/qi - add support for XTS with 16B IV

[Andrei Botila]

From: Andrei Botila <andrei.bot...@nxp.com>

Newer CAAM versions (Era 9+) support 16B IVs. Since for these devices
the HW limitation is no longer present newer version should process the
requests containing 16B IVs directly in hardware without using a fallback.

Signed-off-by: Andrei Botila <andrei.bot...@nxp.com>
---
 drivers/crypto/caam/caamalg_qi.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index efcc7cb050fc..66f60d78bdc8 100644
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -733,6 +733,7 @@ static int xts_skcipher_setkey(struct crypto_skcipher 
*skcipher, const u8 *key,
 {
        struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);
        struct device *jrdev = ctx->jrdev;
+       struct caam_drv_private *ctrlpriv = dev_get_drvdata(jrdev->parent);
        int ret = 0;
        int err;
 
@@ -745,9 +746,11 @@ static int xts_skcipher_setkey(struct crypto_skcipher 
*skcipher, const u8 *key,
        if (keylen != 2 * AES_KEYSIZE_128 && keylen != 2 * AES_KEYSIZE_256)
                ctx->xts_key_fallback = true;
 
-       err = crypto_skcipher_setkey(ctx->fallback, key, keylen);
-       if (err)
-               return err;
+       if (ctrlpriv->era <= 8 || ctx->xts_key_fallback) {
+               err = crypto_skcipher_setkey(ctx->fallback, key, keylen);
+               if (err)
+                       return err;
+       }
 
        ctx->cdata.keylen = keylen;
        ctx->cdata.key_virt = key;
@@ -1403,6 +1406,7 @@ static inline int skcipher_crypt(struct skcipher_request 
*req, bool encrypt)
        struct skcipher_edesc *edesc;
        struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
        struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);
+       struct caam_drv_private *ctrlpriv = dev_get_drvdata(ctx->jrdev->parent);
        int ret;
 
        /*
@@ -1413,7 +1417,7 @@ static inline int skcipher_crypt(struct skcipher_request 
*req, bool encrypt)
        if (!req->cryptlen && !ctx->fallback)
                return 0;
 
-       if (ctx->fallback && (xts_skcipher_ivsize(req) ||
+       if (ctx->fallback && ((ctrlpriv->era <= 8 && xts_skcipher_ivsize(req)) 
||
                              ctx->xts_key_fallback)) {
                struct caam_skcipher_req_ctx *rctx = skcipher_request_ctx(req);
 
-- 
2.17.1