[PATCH 9/9] crypto: caam/qi2 - 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_qi2.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/caam/caamalg_qi2.c 
b/drivers/crypto/caam/caamalg_qi2.c
index f2f137f47972..99b1267b1a0b 100644
--- a/drivers/crypto/caam/caamalg_qi2.c
+++ b/drivers/crypto/caam/caamalg_qi2.c
@@ -1057,6 +1057,7 @@ static int xts_skcipher_setkey(struct crypto_skcipher 
*skcipher, const u8 *key,
 {
        struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);
        struct device *dev = ctx->dev;
+       struct dpaa2_caam_priv *priv = dev_get_drvdata(dev);
        struct caam_flc *flc;
        u32 *desc;
        int err;
@@ -1067,9 +1068,12 @@ static int xts_skcipher_setkey(struct crypto_skcipher 
*skcipher, const u8 *key,
                return err;
        }
 
-       err = crypto_skcipher_setkey(ctx->fallback, key, keylen);
-       if (err)
-               return err;
+       if (priv->sec_attr.era <= 8 || (keylen != 2 * AES_KEYSIZE_128 &&
+                                       keylen != 2 * AES_KEYSIZE_256)) {
+               err = crypto_skcipher_setkey(ctx->fallback, key, keylen);
+               if (err)
+                       return err;
+       }
 
        ctx->cdata.keylen = keylen;
        ctx->cdata.key_virt = key;
@@ -1472,12 +1476,13 @@ static int skcipher_encrypt(struct skcipher_request 
*req)
        struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
        struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);
        struct caam_request *caam_req = skcipher_request_ctx(req);
+       struct dpaa2_caam_priv *priv = dev_get_drvdata(ctx->dev);
        int ret;
 
        if (!req->cryptlen)
                return 0;
 
-       if (ctx->fallback && (xts_skcipher_ivsize(req) ||
+       if (ctx->fallback && ((priv->sec_attr.era <= 8 && 
xts_skcipher_ivsize(req)) ||
                              (ctx->cdata.keylen != 2 * AES_KEYSIZE_128 &&
                               ctx->cdata.keylen != 2 * AES_KEYSIZE_256))) {
                skcipher_request_set_tfm(&caam_req->fallback_req, 
ctx->fallback);
@@ -1517,12 +1522,13 @@ static int skcipher_decrypt(struct skcipher_request 
*req)
        struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);
        struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);
        struct caam_request *caam_req = skcipher_request_ctx(req);
+       struct dpaa2_caam_priv *priv = dev_get_drvdata(ctx->dev);
        int ret;
 
        if (!req->cryptlen)
                return 0;
 
-       if (ctx->fallback && (xts_skcipher_ivsize(req) ||
+       if (ctx->fallback && ((priv->sec_attr.era <= 8 && 
xts_skcipher_ivsize(req)) ||
                              (ctx->cdata.keylen != 2 * AES_KEYSIZE_128 &&
                               ctx->cdata.keylen != 2 * AES_KEYSIZE_256))) {
                skcipher_request_set_tfm(&caam_req->fallback_req, 
ctx->fallback);
-- 
2.17.1