Commit 4fc98326 authored by Andrei Botila's avatar Andrei Botila Committed by Herbert Xu
Browse files

crypto: caam/qi2 - add support for XTS with 16B IV 



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: default avatarAndrei Botila <andrei.botila@nxp.com>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3a15679b

drivers/crypto/caam/caamalg_qi2.c

+10 −5
Original line number Diff line number Diff line
@@ -1058,6 +1058,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;
@@ -1071,9 +1072,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;



	if (priv->sec_attr.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;
@@ -1470,6 +1473,7 @@ 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;



	/*
@@ -1480,7 +1484,7 @@ static int skcipher_encrypt(struct skcipher_request *req) 
	if (!req->cryptlen && !ctx->fallback)

		return 0;



	if (ctx->fallback && (xts_skcipher_ivsize(req) ||

	if (ctx->fallback && ((priv->sec_attr.era <= 8 && xts_skcipher_ivsize(req)) ||

			      ctx->xts_key_fallback)) {

		skcipher_request_set_tfm(&caam_req->fallback_req, ctx->fallback);

		skcipher_request_set_callback(&caam_req->fallback_req,
@@ -1519,6 +1523,7 @@ 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;



	/*
@@ -1529,7 +1534,7 @@ static int skcipher_decrypt(struct skcipher_request *req) 
	if (!req->cryptlen && !ctx->fallback)

		return 0;



	if (ctx->fallback && (xts_skcipher_ivsize(req) ||

	if (ctx->fallback && ((priv->sec_attr.era <= 8 && xts_skcipher_ivsize(req)) ||

			      ctx->xts_key_fallback)) {

		skcipher_request_set_tfm(&caam_req->fallback_req, ctx->fallback);

		skcipher_request_set_callback(&caam_req->fallback_req,