From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E20B3793D2; Tue, 21 Jul 2026 13:59:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642390; cv=none; b=V7Msg9PYo9Qv44r0qoWW9yvAi74U7COmUeUE8Ez7TB3nxNtuQHiDb1bhzeDqbTNieS0mVUIUTY2b93gA3V1gB0rkYfhrHH5y6i0w+Ubl4QY0YaNJKMRv8JPi1TyXsZ1gNXpBlVxWwObd5N5eCPty7HZrMTa/zgup4lb3zmEIP4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642390; c=relaxed/simple; bh=u3ns9J7SV+wlq3Ub5rl3Zl2GPXPitqTqmT2ODL49mOM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=d1nRtIzAwH1rdUnS9BOrPH2i6nzPUG2/RSRZEjAitLZkJXFNWQK/nnMIY4DgB3vRIbnRuNcSnee57t5kc5EwHPCN8XK3rnul7aAFf4BN0L5pYc7BfZ/bTFVW4hqFVAz6Bp4OpZwOcQvLhrxc22pr2kGSZmH7uKJnJUnUdZCx9U0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=AH5qKcwN; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="AH5qKcwN" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 976C71A113A; Tue, 21 Jul 2026 13:59:46 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 6BA2360368; Tue, 21 Jul 2026 13:59:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3E8E111BD3B69; Tue, 21 Jul 2026 15:59:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642385; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=KDSyxi9TB7IeYEB6Cx07WBLh/K56AQYK5ZPXbQRazak=; b=AH5qKcwNJMwobdPSbBBkanXfOfpFxGmxvilUbdajMya3g5j/KW1EIEIEfuV6tLB19/vEVB XDrotLD7nRkW5FWqbkIMgFHOToo2u/uaBMQAFkm07r/IzDOsnnUkBhr89Z6A+zelM9uxhP Gk/bDKyXd6aiS+9McpI9ZsUT7poZXd6wnRsu6lmTuL3XDN3lx6prbtGQ/UWCi5qIBgz/J1 yD1Qogt/Tbr0U5DlAmXfHBMc67EQaSjFxXO32LpnuwBzzA59lZNSzHxb62TxmNvC70RzS/ BAAXjLApeCM7f5jSEExkUWi51uCAtDnk41WS6i6rBONM49BC3GlylvHlFDxg/A== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:28 +0200 Subject: [PATCH v3 01/19] crypto: talitos/hash - Use CRYPTO_AHASH_BLOCK_ONLY API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-1-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=15337; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=u3ns9J7SV+wlq3Ub5rl3Zl2GPXPitqTqmT2ODL49mOM=; b=/e2ox1kgOMOGzWsvdW2nuseLOWXP/nDKRnYKuBMIwTp4Q/tGwauz1cFv9rO9h0JGJvVSNfk8h g9dSwTn5cqRA9mKc8d6gZ8/Vgguy5EMlL3Sf7YESaYp0AWoUc0Ye1IG X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 The hash implementation maintained a software buffer to accumulate partial blocks across update() calls, copying data to/from scatterlists with sg_copy_to_buffer()/sg_pcopy_to_buffer() and chaining in a virtual scatterlist entry. This is unnecessary now with CRYPTO_AHASH_ALG_BLOCK_ONLY flag. Remove unnecessary fields in the request and export structure. On completion, pass any remaining tail bytes back via ahash_request_complete() so that the core re-submits them with the next request. Signed-off-by: Paul Louvel --- drivers/crypto/talitos.c | 168 +++++++++++++++++--------------------------= ---- 1 file changed, 62 insertions(+), 106 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 584508963241..99853faf20e8 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -935,31 +935,26 @@ struct talitos_ctx { unsigned int authkeylen; }; =20 -#define HASH_MAX_BLOCK_SIZE SHA512_BLOCK_SIZE #define TALITOS_MDEU_MAX_CONTEXT_SIZE TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA= 512 =20 struct talitos_ahash_req_ctx { u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)]; + u8 padding_buf[64]; + u64 message_size; unsigned int hw_context_size; - u8 buf[2][HASH_MAX_BLOCK_SIZE]; - int buf_idx; unsigned int swinit; unsigned int first_request; unsigned int last_request; unsigned int to_hash_later; - unsigned int nbuf; - struct scatterlist bufsl[2]; - struct scatterlist *psrc; }; =20 struct talitos_export_state { u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)]; - u8 buf[HASH_MAX_BLOCK_SIZE]; + u64 message_size; unsigned int swinit; unsigned int first_request; unsigned int last_request; unsigned int to_hash_later; - unsigned int nbuf; }; =20 static int aead_setkey(struct crypto_aead *authenc, @@ -1826,14 +1821,8 @@ static void ahash_done(struct device *dev, struct talitos_edesc *next; =20 if (is_sec1) { - if (!req_ctx->last_request && req_ctx->to_hash_later) { - /* Position any partial block for next update/final/finup */ - req_ctx->buf_idx =3D (req_ctx->buf_idx + 1) & 1; - req_ctx->nbuf =3D req_ctx->to_hash_later; - } - free_edesc_list_from(areq, edesc); - ahash_request_complete(areq, err); + ahash_request_complete(areq, err ?: req_ctx->to_hash_later); } else { next =3D edesc->next_desc; =20 @@ -1851,14 +1840,9 @@ static void ahash_done(struct device *dev, return; } out: - if (!req_ctx->last_request && req_ctx->to_hash_later) { - /* Position any partial block for next update/final/finup */ - req_ctx->buf_idx =3D (req_ctx->buf_idx + 1) & 1; - req_ctx->nbuf =3D req_ctx->to_hash_later; - } if (err && next) free_edesc_list_from(areq, next); - ahash_request_complete(areq, err); + ahash_request_complete(areq, err ?: req_ctx->to_hash_later); } } =20 @@ -1866,21 +1850,21 @@ static void ahash_done(struct device *dev, * SEC1 doesn't like hashing of 0 sized message, so we do the padding * ourself and submit a padded block */ -static void talitos_handle_buggy_hash(struct talitos_ctx *ctx, - struct talitos_edesc *edesc, - struct talitos_ptr *ptr) +static void talitos_handle_buggy_hash(struct talitos_ahash_req_ctx *req_ct= x, + struct talitos_ctx *ctx, + struct talitos_edesc *edesc, + struct talitos_ptr *ptr) { - static u8 padded_hash[64] =3D { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - }; + __be64 len =3D cpu_to_be64(req_ctx->message_size << 3); + + memset(req_ctx->padding_buf, 0, sizeof(req_ctx->padding_buf)); + req_ctx->padding_buf[0] =3D 0x80; + memcpy(&req_ctx->padding_buf[56], &len, sizeof(len)); =20 pr_err_once("Bug in SEC1, padding ourself\n"); edesc->desc.hdr &=3D ~DESC_HDR_MODE0_MDEU_PAD; - map_single_talitos_ptr(ctx->dev, ptr, sizeof(padded_hash), - (char *)padded_hash, DMA_TO_DEVICE); + map_single_talitos_ptr(ctx->dev, ptr, sizeof(req_ctx->padding_buf), + (char *)req_ctx->padding_buf, DMA_TO_DEVICE); } =20 static void common_nonsnoop_hash(struct talitos_edesc *edesc, @@ -1945,7 +1929,7 @@ static void common_nonsnoop_hash(struct talitos_edesc= *edesc, /* last DWORD empty */ =20 if (is_sec1 && from_talitos_ptr_len(&desc->ptr[3], true) =3D=3D 0) - talitos_handle_buggy_hash(ctx, edesc, &desc->ptr[3]); + talitos_handle_buggy_hash(req_ctx, ctx, edesc, &desc->ptr[3]); =20 if (sync_needed) dma_sync_single_for_device(dev, edesc->dma_link_tbl, @@ -1978,7 +1962,7 @@ ahash_process_req_prepare(struct ahash_request *areq,= unsigned int nbytes, size_t offset =3D 0; =20 do { - src =3D scatterwalk_ffwd(tmp, req_ctx->psrc, offset); + src =3D scatterwalk_ffwd(tmp, areq->src, offset); =20 to_hash_this_desc =3D min(nbytes, ALIGN_DOWN(desc_max, blocksize)); @@ -1991,8 +1975,7 @@ ahash_process_req_prepare(struct ahash_request *areq,= unsigned int nbytes, return edesc; } =20 - edesc->src =3D - scatterwalk_ffwd(edesc->bufsl, req_ctx->psrc, offset); + edesc->src =3D scatterwalk_ffwd(edesc->bufsl, areq->src, offset); edesc->desc.hdr =3D ctx->desc_hdr_template; edesc->first =3D offset =3D=3D 0; edesc->last =3D nbytes - to_hash_this_desc =3D=3D 0; @@ -2045,62 +2028,17 @@ static int ahash_process_req(struct ahash_request *= areq, unsigned int nbytes) bool is_sec1 =3D has_ftr_sec1(dev_get_drvdata(ctx->dev)); unsigned int nbytes_to_hash; unsigned int to_hash_later; - unsigned int nsg; - int nents; struct device *dev =3D ctx->dev; - u8 *ctx_buf =3D req_ctx->buf[req_ctx->buf_idx]; int ret; =20 - if (!req_ctx->last_request && (nbytes + req_ctx->nbuf <=3D blocksize)) { - /* Buffer up to one whole block */ - nents =3D sg_nents_for_len(areq->src, nbytes); - if (nents < 0) { - dev_err(dev, "Invalid number of src SG.\n"); - return nents; - } - sg_copy_to_buffer(areq->src, nents, - ctx_buf + req_ctx->nbuf, nbytes); - req_ctx->nbuf +=3D nbytes; - return 0; - } - - /* At least (blocksize + 1) bytes are available to hash */ - nbytes_to_hash =3D nbytes + req_ctx->nbuf; - to_hash_later =3D nbytes_to_hash & (blocksize - 1); + nbytes_to_hash =3D ALIGN_DOWN(nbytes, blocksize); + to_hash_later =3D nbytes - nbytes_to_hash; =20 - if (req_ctx->last_request) + if (req_ctx->last_request) { + nbytes_to_hash =3D nbytes; to_hash_later =3D 0; - else if (to_hash_later) - /* There is a partial block. Hash the full block(s) now */ - nbytes_to_hash -=3D to_hash_later; - else { - /* Keep one block buffered */ - nbytes_to_hash -=3D blocksize; - to_hash_later =3D blocksize; - } - - /* Chain in any previously buffered data */ - if (req_ctx->nbuf) { - nsg =3D (req_ctx->nbuf < nbytes_to_hash) ? 2 : 1; - sg_init_table(req_ctx->bufsl, nsg); - sg_set_buf(req_ctx->bufsl, ctx_buf, req_ctx->nbuf); - if (nsg > 1) - sg_chain(req_ctx->bufsl, 2, areq->src); - req_ctx->psrc =3D req_ctx->bufsl; - } else - req_ctx->psrc =3D areq->src; - - if (to_hash_later) { - nents =3D sg_nents_for_len(areq->src, nbytes); - if (nents < 0) { - dev_err(dev, "Invalid number of src SG.\n"); - return nents; - } - sg_pcopy_to_buffer(areq->src, nents, - req_ctx->buf[(req_ctx->buf_idx + 1) & 1], - to_hash_later, - nbytes - to_hash_later); } + req_ctx->to_hash_later =3D to_hash_later; =20 edesc =3D ahash_process_req_prepare(areq, nbytes_to_hash, blocksize, @@ -2125,8 +2063,6 @@ static int ahash_init(struct ahash_request *areq) dma_addr_t dma; =20 /* Initialize the context */ - req_ctx->buf_idx =3D 0; - req_ctx->nbuf =3D 0; req_ctx->first_request =3D 1; req_ctx->swinit =3D 0; /* assume h/w init of context */ size =3D (crypto_ahash_digestsize(tfm) <=3D SHA256_DIGEST_SIZE) @@ -2223,12 +2159,11 @@ static int ahash_export(struct ahash_request *areq,= void *out) =20 memcpy(export->hw_context, req_ctx->hw_context, req_ctx->hw_context_size); - memcpy(export->buf, req_ctx->buf[req_ctx->buf_idx], req_ctx->nbuf); export->swinit =3D req_ctx->swinit; export->first_request =3D req_ctx->first_request; export->last_request =3D req_ctx->last_request; export->to_hash_later =3D req_ctx->to_hash_later; - export->nbuf =3D req_ctx->nbuf; + export->message_size =3D req_ctx->message_size; =20 return 0; } @@ -2249,12 +2184,11 @@ static int ahash_import(struct ahash_request *areq,= const void *in) : TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512; req_ctx->hw_context_size =3D size; memcpy(req_ctx->hw_context, export->hw_context, size); - memcpy(req_ctx->buf[0], export->buf, export->nbuf); req_ctx->swinit =3D export->swinit; req_ctx->first_request =3D export->first_request; req_ctx->last_request =3D export->last_request; req_ctx->to_hash_later =3D export->to_hash_later; - req_ctx->nbuf =3D export->nbuf; + req_ctx->message_size =3D export->message_size; =20 dma =3D dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size, DMA_TO_DEVICE); @@ -2932,8 +2866,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "md5", .cra_driver_name =3D "md5-talitos", .cra_blocksize =3D MD5_HMAC_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -2948,8 +2884,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "sha1", .cra_driver_name =3D "sha1-talitos", .cra_blocksize =3D SHA1_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -2964,8 +2902,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "sha224", .cra_driver_name =3D "sha224-talitos", .cra_blocksize =3D SHA224_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -2980,8 +2920,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "sha256", .cra_driver_name =3D "sha256-talitos", .cra_blocksize =3D SHA256_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -2996,8 +2938,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "sha384", .cra_driver_name =3D "sha384-talitos", .cra_blocksize =3D SHA384_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -3012,8 +2956,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "sha512", .cra_driver_name =3D "sha512-talitos", .cra_blocksize =3D SHA512_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -3028,8 +2974,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "hmac(md5)", .cra_driver_name =3D "hmac-md5-talitos", .cra_blocksize =3D MD5_HMAC_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -3044,8 +2992,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "hmac(sha1)", .cra_driver_name =3D "hmac-sha1-talitos", .cra_blocksize =3D SHA1_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -3060,8 +3010,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "hmac(sha224)", .cra_driver_name =3D "hmac-sha224-talitos", .cra_blocksize =3D SHA224_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -3076,8 +3028,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "hmac(sha256)", .cra_driver_name =3D "hmac-sha256-talitos", .cra_blocksize =3D SHA256_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -3092,8 +3046,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "hmac(sha384)", .cra_driver_name =3D "hmac-sha384-talitos", .cra_blocksize =3D SHA384_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -3108,8 +3064,10 @@ static struct talitos_alg_template driver_algs[] =3D= { .cra_name =3D "hmac(sha512)", .cra_driver_name =3D "hmac-sha512-talitos", .cra_blocksize =3D SHA512_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, } }, .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | @@ -3181,8 +3139,6 @@ static int talitos_cra_init_ahash(struct crypto_tfm *= tfm) algt.alg.hash); =20 ctx->keylen =3D 0; - crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm), - sizeof(struct talitos_ahash_req_ctx)); =20 return talitos_init_common(ctx, talitos_alg); } --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9631379C29; Tue, 21 Jul 2026 13:59:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642390; cv=none; b=i6481iskGxkhza8m9R9hQ9HJsJoAGf8LFUSLR0mBpGQTU0gh1qyFMTPtJqY6A5VF73c091sgN7yWo6f7ltjfUR38pAlmGwo5KDekL6kGtKSJaV0v0YcIfmqnVW5VXA2oRiI7Efdnjy+QNUOxCC4pGCH/brL6fPNszl4RCFhXBGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642390; c=relaxed/simple; bh=yaXKr3O9oVwNeilhdumgiN2IKJ43A5ZRpI27evZYZUA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mC4w1bmzmYH9hqqkGe+EeuwKmLXgKYINpS7MLsdsX24jL3I7J++i48pYZVJVJ3LrTJ3UsWBl8+zkZTjHrzXetH7/KQdsu7YMYHjV/nV2xmn5ufVAs4+JenPbmRa8DAdr7O5nUEA+22eLhsp8RQP9WCp3U2wO5D/qyde7oAQ/ll8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=OyjM93+C; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="OyjM93+C" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 998B91A113B; Tue, 21 Jul 2026 13:59:47 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 6DA5560368; Tue, 21 Jul 2026 13:59:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2682911BD2635; Tue, 21 Jul 2026 15:59:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642386; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=96+ugB1tJDCl1moMfOVYZVvOsc93ChgjShCEQRyijOM=; b=OyjM93+Cfjob2TIv4zV+FLyUkC680xLb5BwFtiz3VXTMBTxmeh3wct7LfKOQ9HWNkdLp8u V8k66a7rovdHNmPRakmX/qV1/z2RfOGsQ3dU33nUecRyJJvnQ8kSuhDZPk+0vygEui92Um vdB5aCoIDlzrFpM3yttLaovI31FmWxfJVb7eSJgqTzIuKRwgv9UB8I6JgnadKdJvK4pg29 /VV7Qw/PPsMhBYFio/OkrqS1H6GdqBtRMMPZDCiT0uqL4PSvMuOpTXaWx2p3BMNHMkJfes oQ1qvDnbzpOuDnUSRW2PbfG+HU0SJj0es4KkxTf7DdShYwYXUTfRqlzJQ4BeJA== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:29 +0200 Subject: [PATCH v3 02/19] crypto: talitos - Move driver into dedicated directory Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-2-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=4762; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=yaXKr3O9oVwNeilhdumgiN2IKJ43A5ZRpI27evZYZUA=; b=zNGVJ+Cu9TE9GViefB+BwGcKcNj6Cb8j72UhimQbSUntkfAj6smBKy/k/CV3a1vLPHtKMp+Jr Hl7B31DYHtPBYC/V02O+Ntu4AfS1tlufl2QonqCdZFzQq6cBTzMWqCi X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Move the talitos driver files from drivers/crypto/ into drivers/crypto/talitos/ to accommodate upcoming code reorganization. Signed-off-by: Paul Louvel --- drivers/crypto/Kconfig | 38 +-----------------------------= ---- drivers/crypto/Makefile | 2 +- drivers/crypto/talitos/Kconfig | 36 ++++++++++++++++++++++++++++++= ++ drivers/crypto/talitos/Makefile | 1 + drivers/crypto/{ =3D> talitos}/talitos.c | 0 drivers/crypto/{ =3D> talitos}/talitos.h | 0 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index d23b58b81ca3..783b5dc42a42 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -253,43 +253,7 @@ config CRYPTO_DEV_HIFN_795X_RNG on the HIFN 795x crypto adapters. =20 source "drivers/crypto/caam/Kconfig" - -config CRYPTO_DEV_TALITOS - tristate "Talitos Freescale Security Engine (SEC)" - select CRYPTO_AEAD - select CRYPTO_AUTHENC - select CRYPTO_SKCIPHER - select CRYPTO_HASH - select CRYPTO_LIB_DES - select HW_RANDOM - depends on FSL_SOC - help - Say 'Y' here to use the Freescale Security Engine (SEC) - to offload cryptographic algorithm computation. - - The Freescale SEC is present on PowerQUICC 'E' processors, such - as the MPC8349E and MPC8548E. - - To compile this driver as a module, choose M here: the module - will be called talitos. - -config CRYPTO_DEV_TALITOS1 - bool "SEC1 (SEC 1.0 and SEC Lite 1.2)" - depends on CRYPTO_DEV_TALITOS - depends on PPC_8xx || PPC_82xx - default y - help - Say 'Y' here to use the Freescale Security Engine (SEC) version 1.0 - found on MPC82xx or the Freescale Security Engine (SEC Lite) - version 1.2 found on MPC8xx - -config CRYPTO_DEV_TALITOS2 - bool "SEC2+ (SEC version 2.0 or upper)" - depends on CRYPTO_DEV_TALITOS - default y if !PPC_8xx - help - Say 'Y' here to use the Freescale Security Engine (SEC) - version 2 and following as found on MPC83xx, MPC85xx, etc ... +source "drivers/crypto/talitos/Kconfig" =20 config CRYPTO_DEV_PPC4XX tristate "Driver AMCC PPC4xx crypto accelerator" diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile index 283bbc650b5b..a059139d4a75 100644 --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile @@ -35,7 +35,7 @@ obj-$(CONFIG_CRYPTO_DEV_SA2UL) +=3D sa2ul.o obj-$(CONFIG_CRYPTO_DEV_SAHARA) +=3D sahara.o obj-$(CONFIG_CRYPTO_DEV_SL3516) +=3D gemini/ obj-y +=3D stm32/ -obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D talitos.o +obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D talitos/ obj-$(CONFIG_CRYPTO_DEV_TEGRA) +=3D tegra/ obj-$(CONFIG_CRYPTO_DEV_VIRTIO) +=3D virtio/ obj-$(CONFIG_CRYPTO_DEV_BCM_SPU) +=3D bcm/ diff --git a/drivers/crypto/talitos/Kconfig b/drivers/crypto/talitos/Kconfig new file mode 100644 index 000000000000..c3470553a966 --- /dev/null +++ b/drivers/crypto/talitos/Kconfig @@ -0,0 +1,36 @@ +config CRYPTO_DEV_TALITOS + tristate "Talitos Freescale Security Engine (SEC)" + select CRYPTO_AEAD + select CRYPTO_AUTHENC + select CRYPTO_SKCIPHER + select CRYPTO_HASH + select CRYPTO_LIB_DES + select HW_RANDOM + depends on FSL_SOC + help + Say 'Y' here to use the Freescale Security Engine (SEC) + to offload cryptographic algorithm computation. + + The Freescale SEC is present on PowerQUICC 'E' processors, such + as the MPC8349E and MPC8548E. + + To compile this driver as a module, choose M here: the module + will be called talitos. + +config CRYPTO_DEV_TALITOS1 + bool "SEC1 (SEC 1.0 and SEC Lite 1.2)" + depends on CRYPTO_DEV_TALITOS + depends on PPC_8xx || PPC_82xx + default y + help + Say 'Y' here to use the Freescale Security Engine (SEC) version 1.0 + found on MPC82xx or the Freescale Security Engine (SEC Lite) + version 1.2 found on MPC8xx + +config CRYPTO_DEV_TALITOS2 + bool "SEC2+ (SEC version 2.0 or upper)" + depends on CRYPTO_DEV_TALITOS + default y if !PPC_8xx + help + Say 'Y' here to use the Freescale Security Engine (SEC) + version 2 and following as found on MPC83xx, MPC85xx, etc ... diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile new file mode 100644 index 000000000000..fcc5db5e63c2 --- /dev/null +++ b/drivers/crypto/talitos/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D talitos.o diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos/talitos.c similarity index 100% rename from drivers/crypto/talitos.c rename to drivers/crypto/talitos/talitos.c diff --git a/drivers/crypto/talitos.h b/drivers/crypto/talitos/talitos.h similarity index 100% rename from drivers/crypto/talitos.h rename to drivers/crypto/talitos/talitos.h --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 17EC237A4BC; Tue, 21 Jul 2026 13:59:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642391; cv=none; b=awRyj3yFR2Zrx80/pFXXSOGhHlCMTwjchbX+5VS7P02Iwe7PwK0uOxjMxLxBy11khz/hWjxXji+nPbH6Of4edPpmjb2dBmGr4p7PZY/Ic/DAgnIJf71IftytN1MLGlVZ7IE9ME0EnWxD0e6ROd2+hGS+DYhB2NjioexpW3BCA3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642391; c=relaxed/simple; bh=VvWmItoUQiGewUC2IELznrd9XVVzduHJxyDnp+f+yvA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Iu28NYlUNi6qeWPoedH3oI01LeWoOkjcYcp47vIhjnF2UHg8cbAMZb6W2YfghbZc0Qokgl6gKAjdu0efLTFu+1WMtwjLI+OMEP/vuyZ7aWzEtTKqslE8ArDrrLeisuwfVPgcAvjVfZIPRQ9KpBBTU0BwZP55BOH6lql7+rPaeFQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=OK2mIBF/; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="OK2mIBF/" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 8FD021A113D; Tue, 21 Jul 2026 13:59:48 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 65D8E60368; Tue, 21 Jul 2026 13:59:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1068F11BD3B71; Tue, 21 Jul 2026 15:59:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642387; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Pe9Emy5v5mPIfmU1/Rd8sQfQzmZN0jQSVhfcNdPKtIE=; b=OK2mIBF/nuY2483izyEuvH2PC3dvXeLrrjPWOyGqrQMBm3MF7gFzIEnWF2p+i66xqoEq9k ZTikuGULYg8aSrBNiFO7XIoKBYNOZnxlQ1TrEebpg4w5WF8wXu5ERh6+7Cm+UDhtxPVa/Z yf2ZWqqu6nhYrq/p0pJRuXEhnLWoacn9x6iv3jCzL0yyQGJyu/bBqzAaU8F6gx9YmRagj9 Z3UndRZZHYw5DYy9U8XrZw79ZmtwEl3yDOkieSch/PK4zXdXkwAgYw4tndijD1Vtu/CtkM f8wWbdPJN822xVlbIZLVUrBoJwlM50lTzbh1kw6zugOmDxW+5iQRNnpnQ+P6EA== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:30 +0200 Subject: [PATCH v3 03/19] crypto: talitos - Add missing includes to driver header file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-3-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=1415; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=VvWmItoUQiGewUC2IELznrd9XVVzduHJxyDnp+f+yvA=; b=bsoZPq2Xe1YhDDGGGqUsaIaqlf9XPbXtsyS8tZeaedHj6pTQfDY6CyI1BGhf3lY0b1VkaZDTz yUrSM6Ob5uBA+BBOcgXJKJsFb/gvbmO6TW2j/zlPRXTQttOco0LBAlt X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Add explicit includes for types used by the header file to make it self-contained and fix implicit include dependencies. Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos.c | 3 --- drivers/crypto/talitos/talitos.h | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 99853faf20e8..753481d3189a 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -15,10 +15,7 @@ #include #include #include -#include -#include #include -#include #include #include #include diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index d4ff8d589f46..56e36a65ddcc 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -5,6 +5,12 @@ * Copyright (c) 2006-2011 Freescale Semiconductor, Inc. */ =20 +#include +#include +#include +#include +#include + #define TALITOS_TIMEOUT 100000 #define TALITOS1_MAX_DATA_LEN 32768 #define TALITOS2_MAX_DATA_LEN 65535 --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 784EA37BE87; Tue, 21 Jul 2026 13:59:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642393; cv=none; b=HNU0hUArGdLpterR7ZKksY+4kPBglTjIeybfU7BY89qs0Htn0TN2a2UJ9qBdPzgx7C/3eQX3+Q5AN8inonCxHCk0KmojsPJTACSbCLOJ81cK1uxZuPiTSHQ5/rc9UjH+THVOXW/gDRH6tnf/YTjDIbOUeDwDHEFVW3GBkV7mkN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642393; c=relaxed/simple; bh=CVdDSuYexNtNl6N+cqyzxUpW849YisOVb/g0EdpbuDc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hPa5cSpolf7JZCH7gsfPbos9Ocx7tOEFU9bf2m1/RJxuLDZ+nPmZc3ptdLwkm61Xn+isy5qBmf4Zol4raDG7UU7ugfHu0+sCjcVSHIljDLwOsANKXVNkq+BDVfCobyfaW6K57Y4VxzuDvn0KusoPZmd9VOwBnZNtdWFi9ss7jKg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=lYBfHsFm; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="lYBfHsFm" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 11E4A1A113E; Tue, 21 Jul 2026 13:59:50 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id D348F60368; Tue, 21 Jul 2026 13:59:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 134B911BD3B76; Tue, 21 Jul 2026 15:59:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642389; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=dWY8dsRH+pL6ibWTKb6Vw9bchOZ0iZbpl5Sm2Mb8eyo=; b=lYBfHsFmuKZfk2oZke51XpqzrAF6jp3THvap/x28BhOyd8zInQ8Ytz9h7ryHJurwdMfeE+ xik2zoQE4fn+ynRaUDlHr8lxUie51iBC9aLRT8WBRzTPBzyHBXsRcDZOKP6pZJkkMg5xZp Ha+RSf5xqN6/Tcd+D7x563wpqKfnPyR7GXAjhtA20AvCcYXVKFGLWVpNctiXMRh5Kpfcll K+QCfRSuBYqjiSEAdFMpfgT3GGPu6KmNCU90K6EzRMjpWeaGnHb7kGu1ihLyFyi5xw9Are ZLNwtCDak6qUOOLli0x8ggEO+fVyp3oCInvcdAboI+0Sn01befTKReukd3lB4Q== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:31 +0200 Subject: [PATCH v3 04/19] crypto: talitos/hwrng - Move into separate file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-4-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=6422; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=CVdDSuYexNtNl6N+cqyzxUpW849YisOVb/g0EdpbuDc=; b=jRmJkQgYDgpm+RPGqpaiikDQwCnpXuL+3buwHqCiF5CTGBIFtO1+tY9yoJS+q9O1UH/1+SK81 bDChZkGUBUeDmjfk0zj1JhrJHwrzOyPGEUhwd6FADm1gaoK7FuJMwvO X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Move the hardware random number generator implementation from talitos.c into a dedicated talitos-rng.c file. Signed-off-by: Paul Louvel --- drivers/crypto/talitos/Makefile | 2 + drivers/crypto/talitos/talitos-rng.c | 93 ++++++++++++++++++++++++++++++++= ++++ drivers/crypto/talitos/talitos.c | 83 -------------------------------- drivers/crypto/talitos/talitos.h | 5 ++ 4 files changed, 100 insertions(+), 83 deletions(-) diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile index fcc5db5e63c2..901ec681f010 100644 --- a/drivers/crypto/talitos/Makefile +++ b/drivers/crypto/talitos/Makefile @@ -1 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D talitos.o + +talitos-y :=3D talitos.o talitos-rng.o diff --git a/drivers/crypto/talitos/talitos-rng.c b/drivers/crypto/talitos/= talitos-rng.c new file mode 100644 index 000000000000..3aa00de33b25 --- /dev/null +++ b/drivers/crypto/talitos/talitos-rng.c @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +/* + * Freescale SEC (talitos) device hardware random number generator impleme= ntation + * + * Copyright (c) 2006-2011 Freescale Semiconductor, Inc. + */ + +#include +#include + +#include "talitos.h" + +static int talitos_rng_data_present(struct hwrng *rng, int wait) +{ + struct device *dev =3D (struct device *)rng->priv; + struct talitos_private *priv =3D dev_get_drvdata(dev); + u32 ofl; + int i; + + for (i =3D 0; i < 20; i++) { + ofl =3D in_be32(priv->reg_rngu + TALITOS_EUSR_LO) & + TALITOS_RNGUSR_LO_OFL; + if (ofl || !wait) + break; + udelay(10); + } + + return !!ofl; +} + +static int talitos_rng_data_read(struct hwrng *rng, u32 *data) +{ + struct device *dev =3D (struct device *)rng->priv; + struct talitos_private *priv =3D dev_get_drvdata(dev); + + /* rng fifo requires 64-bit accesses */ + *data =3D in_be32(priv->reg_rngu + TALITOS_EU_FIFO); + *data =3D in_be32(priv->reg_rngu + TALITOS_EU_FIFO_LO); + + return sizeof(u32); +} + +static int talitos_rng_init(struct hwrng *rng) +{ + struct device *dev =3D (struct device *)rng->priv; + struct talitos_private *priv =3D dev_get_drvdata(dev); + unsigned int timeout =3D TALITOS_TIMEOUT; + + setbits32(priv->reg_rngu + TALITOS_EURCR_LO, TALITOS_RNGURCR_LO_SR); + while (!(in_be32(priv->reg_rngu + TALITOS_EUSR_LO) + & TALITOS_RNGUSR_LO_RD) + && --timeout) + cpu_relax(); + if (timeout =3D=3D 0) { + dev_err(dev, "failed to reset rng hw\n"); + return -ENODEV; + } + + /* start generating */ + setbits32(priv->reg_rngu + TALITOS_EUDSR_LO, 0); + + return 0; +} + +int talitos_register_rng(struct device *dev) +{ + struct talitos_private *priv =3D dev_get_drvdata(dev); + int err; + + priv->rng.name =3D dev_driver_string(dev); + priv->rng.init =3D talitos_rng_init; + priv->rng.data_present =3D talitos_rng_data_present; + priv->rng.data_read =3D talitos_rng_data_read; + priv->rng.priv =3D (unsigned long)dev; + + err =3D hwrng_register(&priv->rng); + if (!err) + priv->rng_registered =3D true; + + return err; +} + +void talitos_unregister_rng(struct device *dev) +{ + struct talitos_private *priv =3D dev_get_drvdata(dev); + + if (!priv->rng_registered) + return; + + hwrng_unregister(&priv->rng); + priv->rng_registered =3D false; +} diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 753481d3189a..074f399b6327 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -820,89 +820,6 @@ DEF_TALITOS2_INTERRUPT(ch0_2, TALITOS2_ISR_CH_0_2_DONE= , TALITOS2_ISR_CH_0_2_ERR, DEF_TALITOS2_INTERRUPT(ch1_3, TALITOS2_ISR_CH_1_3_DONE, TALITOS2_ISR_CH_1_= 3_ERR, 1) =20 -/* - * hwrng - */ -static int talitos_rng_data_present(struct hwrng *rng, int wait) -{ - struct device *dev =3D (struct device *)rng->priv; - struct talitos_private *priv =3D dev_get_drvdata(dev); - u32 ofl; - int i; - - for (i =3D 0; i < 20; i++) { - ofl =3D in_be32(priv->reg_rngu + TALITOS_EUSR_LO) & - TALITOS_RNGUSR_LO_OFL; - if (ofl || !wait) - break; - udelay(10); - } - - return !!ofl; -} - -static int talitos_rng_data_read(struct hwrng *rng, u32 *data) -{ - struct device *dev =3D (struct device *)rng->priv; - struct talitos_private *priv =3D dev_get_drvdata(dev); - - /* rng fifo requires 64-bit accesses */ - *data =3D in_be32(priv->reg_rngu + TALITOS_EU_FIFO); - *data =3D in_be32(priv->reg_rngu + TALITOS_EU_FIFO_LO); - - return sizeof(u32); -} - -static int talitos_rng_init(struct hwrng *rng) -{ - struct device *dev =3D (struct device *)rng->priv; - struct talitos_private *priv =3D dev_get_drvdata(dev); - unsigned int timeout =3D TALITOS_TIMEOUT; - - setbits32(priv->reg_rngu + TALITOS_EURCR_LO, TALITOS_RNGURCR_LO_SR); - while (!(in_be32(priv->reg_rngu + TALITOS_EUSR_LO) - & TALITOS_RNGUSR_LO_RD) - && --timeout) - cpu_relax(); - if (timeout =3D=3D 0) { - dev_err(dev, "failed to reset rng hw\n"); - return -ENODEV; - } - - /* start generating */ - setbits32(priv->reg_rngu + TALITOS_EUDSR_LO, 0); - - return 0; -} - -static int talitos_register_rng(struct device *dev) -{ - struct talitos_private *priv =3D dev_get_drvdata(dev); - int err; - - priv->rng.name =3D dev_driver_string(dev); - priv->rng.init =3D talitos_rng_init; - priv->rng.data_present =3D talitos_rng_data_present; - priv->rng.data_read =3D talitos_rng_data_read; - priv->rng.priv =3D (unsigned long)dev; - - err =3D hwrng_register(&priv->rng); - if (!err) - priv->rng_registered =3D true; - - return err; -} - -static void talitos_unregister_rng(struct device *dev) -{ - struct talitos_private *priv =3D dev_get_drvdata(dev); - - if (!priv->rng_registered) - return; - - hwrng_unregister(&priv->rng); - priv->rng_registered =3D false; -} =20 /* * crypto alg diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index 56e36a65ddcc..fa8c71b1f90f 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -431,3 +431,8 @@ static inline bool has_ftr_sec1(struct talitos_private = *priv) #define DESC_PTR_LNKTBL_JUMP 0x80 #define DESC_PTR_LNKTBL_RET 0x02 #define DESC_PTR_LNKTBL_NEXT 0x01 + +/* Hardware RNG */ + +int talitos_register_rng(struct device *dev); +void talitos_unregister_rng(struct device *dev); --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCF1037E2FB for ; Tue, 21 Jul 2026 13:59:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642395; cv=none; b=qOpcz6aGJHM+MvAU/+T02lcNRU0l3Mgk4JCcu/LoiyO0PWOkNrdxYPe7dbbJxmsBF6oBu5+OYorK+E1hyGxd7fIP0owWGuBrmSH9OM48WwkX4RSkInMhoQkuj+5vhp2P4SoC/77RnczGztQLzhFfcsHsCfADd0Feeg584HCCZ7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642395; c=relaxed/simple; bh=XNxKGUyNJ2pVUAmB0BJ6R8l3pXC46nTBdhveQVesYiE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nytf+Ovo3TPJL0MD5HBfwxj2GezzFf4Lzq6CzNgrHGmKwrTIo7lAT8VDQ3y9JH/EAMvFyosB9Tv7aHEWG/gOZHmWwGeBOvG/9NUg5To8GFlzPPAVv++tDD7ZxIPF46HJFYI1qDchHys3CPc3SOLJRdL+39X5Jzf6X2u01nFOD6U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=TVV1WIyn; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="TVV1WIyn" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 646424E40EA3; Tue, 21 Jul 2026 13:59:51 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 38D4160368; Tue, 21 Jul 2026 13:59:51 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 80DDF11BD3C0D; Tue, 21 Jul 2026 15:59:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642390; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=U00tSCZGPEdfU2RMLoXy2dxoBApBfGuF06F/lSXcJCg=; b=TVV1WIynWLQVeE0IpXuMJLMimcAePeZfQh0p7Exv7/YLvFp2J3q5k4tzn7Co/6s4vs8xjX q0oSigigjoyXDXvxu2x1eg/SwTXVWz/VPp3l2JVMB460E+1+CGaWJDKeyvXAXcIQemR1Zi Bve6wYiUdotYCy1Xfad83DCj4deSSbjBSVq4u0YYfN+y38ZkZCTjJsKbnUgrga9Wh8e/Ij 0/EEVcj44yG7Y6F4pphBizx6aBz9nevBXeQ3vUwj9/aYr4IAwv0mnHvA+pZCr5AJr+u+HI XtKethP5Om7urR5DqInFnfcPRSiF+dxNSK91egox7dLEXCb9Lu7QGJ1Dqs2osg== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:32 +0200 Subject: [PATCH v3 05/19] crypto: talitos - Prepare crypto implementation file splitting Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-5-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=15994; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=XNxKGUyNJ2pVUAmB0BJ6R8l3pXC46nTBdhveQVesYiE=; b=jBQMH0+034NIoKo+naEyC6ZiOz8k23+a0K9OWYiYeRNxU77lgDjKBRn6Okhs/ksT1t4ah6JqD HDeZFtVOzbqCdc3JTVXgJ2kNNFnfLToc8mEZlPb3F8FRFC+QY7+kc6G X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Move all talitos helpers and inline them inside the header file. Remove the static qualifier for the core functions of the driver, they will be called inside each crypto implementation file. Add the common structures too. Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos.c | 182 ++++++-----------------------------= ---- drivers/crypto/talitos/talitos.h | 167 +++++++++++++++++++++++++++++++++++ 2 files changed, 194 insertions(+), 155 deletions(-) diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 074f399b6327..dc92b98ec5ef 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -40,99 +40,6 @@ =20 #include "talitos.h" =20 -static void to_talitos_ptr(struct talitos_ptr *ptr, dma_addr_t dma_addr, - unsigned int len, bool is_sec1) -{ - ptr->ptr =3D cpu_to_be32(lower_32_bits(dma_addr)); - if (is_sec1) { - ptr->len1 =3D cpu_to_be16(len); - } else { - ptr->len =3D cpu_to_be16(len); - ptr->eptr =3D upper_32_bits(dma_addr); - } -} - -static void copy_talitos_ptr(struct talitos_ptr *dst_ptr, - struct talitos_ptr *src_ptr, bool is_sec1) -{ - dst_ptr->ptr =3D src_ptr->ptr; - if (is_sec1) { - dst_ptr->len1 =3D src_ptr->len1; - } else { - dst_ptr->len =3D src_ptr->len; - dst_ptr->eptr =3D src_ptr->eptr; - } -} - -static unsigned short from_talitos_ptr_len(struct talitos_ptr *ptr, - bool is_sec1) -{ - if (is_sec1) - return be16_to_cpu(ptr->len1); - else - return be16_to_cpu(ptr->len); -} - -static void to_talitos_ptr_ext_set(struct talitos_ptr *ptr, u8 val, - bool is_sec1) -{ - if (!is_sec1) - ptr->j_extent =3D val; -} - -static void to_talitos_ptr_ext_or(struct talitos_ptr *ptr, u8 val, bool is= _sec1) -{ - if (!is_sec1) - ptr->j_extent |=3D val; -} - -/* - * map virtual single (contiguous) pointer to h/w descriptor pointer - */ -static void __map_single_talitos_ptr(struct device *dev, - struct talitos_ptr *ptr, - unsigned int len, void *data, - enum dma_data_direction dir, - unsigned long attrs) -{ - dma_addr_t dma_addr =3D dma_map_single_attrs(dev, data, len, dir, attrs); - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); - - to_talitos_ptr(ptr, dma_addr, len, is_sec1); -} - -static void map_single_talitos_ptr(struct device *dev, - struct talitos_ptr *ptr, - unsigned int len, void *data, - enum dma_data_direction dir) -{ - __map_single_talitos_ptr(dev, ptr, len, data, dir, 0); -} - -static void map_single_talitos_ptr_nosync(struct device *dev, - struct talitos_ptr *ptr, - unsigned int len, void *data, - enum dma_data_direction dir) -{ - __map_single_talitos_ptr(dev, ptr, len, data, dir, - DMA_ATTR_SKIP_CPU_SYNC); -} - -/* - * unmap bus single (contiguous) h/w descriptor pointer - */ -static void unmap_single_talitos_ptr(struct device *dev, - struct talitos_ptr *ptr, - enum dma_data_direction dir) -{ - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); - - dma_unmap_single(dev, be32_to_cpu(ptr->ptr), - from_talitos_ptr_len(ptr, is_sec1), dir); -} - static int reset_channel(struct device *dev, int ch) { struct talitos_private *priv =3D dev_get_drvdata(dev); @@ -303,11 +210,11 @@ static void dma_map_request(struct device *dev, struc= t talitos_request *request, * callback must check err and feedback in descriptor header * for device processing status. */ -static int talitos_submit(struct device *dev, int ch, struct talitos_desc = *desc, - void (*callback)(struct device *dev, - struct talitos_desc *desc, - void *context, int error), - void *context) +int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc, + void (*callback)(struct device *dev, + struct talitos_desc *desc, + void *context, int error), + void *context) { struct talitos_private *priv =3D dev_get_drvdata(dev); struct talitos_request *request; @@ -830,24 +737,6 @@ DEF_TALITOS2_INTERRUPT(ch1_3, TALITOS2_ISR_CH_1_3_DONE= , TALITOS2_ISR_CH_1_3_ERR, * HMAC_SNOOP_NO_AFEA (HSNA) instead of type IPSEC_ESP */ #define TALITOS_CRA_PRIORITY_AEAD_HSNA (TALITOS_CRA_PRIORITY - 1) -#ifdef CONFIG_CRYPTO_DEV_TALITOS2 -#define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA512_BLOCK_SIZE) -#else -#define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA256_BLOCK_SIZE) -#endif -#define TALITOS_MAX_IV_LENGTH 16 /* max of AES_BLOCK_SIZE, DES3_EDE_BLOCK= _SIZE */ - -struct talitos_ctx { - struct device *dev; - int ch; - __be32 desc_hdr_template; - u8 key[TALITOS_MAX_KEY_SIZE]; - u8 iv[TALITOS_MAX_IV_LENGTH]; - dma_addr_t dma_key; - unsigned int keylen; - unsigned int enckeylen; - unsigned int authkeylen; -}; =20 #define TALITOS_MDEU_MAX_CONTEXT_SIZE TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA= 512 =20 @@ -941,7 +830,7 @@ static int aead_des3_setkey(struct crypto_aead *authenc, return err; } =20 -static void talitos_sg_unmap(struct device *dev, +void talitos_sg_unmap(struct device *dev, struct talitos_edesc *edesc, struct scatterlist *src, struct scatterlist *dst, @@ -1126,7 +1015,7 @@ static int sg_to_link_tbl_offset(struct scatterlist *= sg, int sg_count, return count; } =20 -static int talitos_sg_map_ext(struct device *dev, struct scatterlist *src, +int talitos_sg_map_ext(struct device *dev, struct scatterlist *src, unsigned int len, struct talitos_edesc *edesc, struct talitos_ptr *ptr, int sg_count, unsigned int offset, int tbl_off, int elen, @@ -1163,7 +1052,7 @@ static int talitos_sg_map_ext(struct device *dev, str= uct scatterlist *src, return sg_count; } =20 -static int talitos_sg_map(struct device *dev, struct scatterlist *src, +int talitos_sg_map(struct device *dev, struct scatterlist *src, unsigned int len, struct talitos_edesc *edesc, struct talitos_ptr *ptr, int sg_count, unsigned int offset, int tbl_off) @@ -1301,17 +1190,17 @@ static int ipsec_esp(struct talitos_edesc *edesc, s= truct aead_request *areq, /* * allocate and map the extended descriptor */ -static struct talitos_edesc *talitos_edesc_alloc(struct device *dev, - struct scatterlist *src, - struct scatterlist *dst, - u8 *iv, - unsigned int assoclen, - unsigned int cryptlen, - unsigned int authsize, - unsigned int ivsize, - int icv_stashing, - u32 cryptoflags, - bool encrypt) +struct talitos_edesc *talitos_edesc_alloc(struct device *dev, + struct scatterlist *src, + struct scatterlist *dst, + u8 *iv, + unsigned int assoclen, + unsigned int cryptlen, + unsigned int authsize, + unsigned int ivsize, + int icv_stashing, + u32 cryptoflags, + bool encrypt) { struct talitos_edesc *edesc; int src_nents, dst_nents, alloc_len, dma_len, src_len, dst_len; @@ -2176,18 +2065,6 @@ static int ahash_setkey(struct crypto_ahash *tfm, co= nst u8 *key, return 0; } =20 - -struct talitos_alg_template { - u32 type; - u32 priority; - union { - struct skcipher_alg skcipher; - struct ahash_alg hash; - struct aead_alg aead; - } alg; - __be32 desc_hdr_template; -}; - static struct talitos_alg_template driver_algs[] =3D { /* AEAD algorithms. These use a single-pass ipsec_esp descriptor */ { .type =3D CRYPTO_ALG_TYPE_AEAD, @@ -2990,14 +2867,8 @@ static struct talitos_alg_template driver_algs[] =3D= { } }; =20 -struct talitos_crypto_alg { - struct list_head entry; - struct device *dev; - struct talitos_alg_template algt; -}; - -static int talitos_init_common(struct talitos_ctx *ctx, - struct talitos_crypto_alg *talitos_alg) +int talitos_init_common(struct talitos_ctx *ctx, + struct talitos_crypto_alg *talitos_alg) { struct talitos_private *priv; =20 @@ -3057,7 +2928,7 @@ static int talitos_cra_init_ahash(struct crypto_tfm *= tfm) return talitos_init_common(ctx, talitos_alg); } =20 -static void talitos_cra_exit(struct crypto_tfm *tfm) +void talitos_cra_exit(struct crypto_tfm *tfm) { struct talitos_ctx *ctx =3D crypto_tfm_ctx(tfm); struct device *dev =3D ctx->dev; @@ -3071,7 +2942,7 @@ static void talitos_cra_exit(struct crypto_tfm *tfm) * type and primary/secondary execution units required match the hw * capabilities description provided in the device tree node. */ -static int hw_supports(struct device *dev, __be32 desc_hdr_template) +int talitos_hw_supports(struct device *dev, __be32 desc_hdr_template) { struct talitos_private *priv =3D dev_get_drvdata(dev); int ret; @@ -3108,7 +2979,7 @@ static void talitos_remove(struct platform_device *of= dev) list_del(&t_alg->entry); } =20 - if (hw_supports(dev, DESC_HDR_SEL0_RNG)) + if (talitos_hw_supports(dev, DESC_HDR_SEL0_RNG)) talitos_unregister_rng(dev); =20 for (i =3D 0; i < 2; i++) @@ -3417,7 +3288,7 @@ static int talitos_probe(struct platform_device *ofde= v) } =20 /* register the RNG, if available */ - if (hw_supports(dev, DESC_HDR_SEL0_RNG)) { + if (talitos_hw_supports(dev, DESC_HDR_SEL0_RNG)) { err =3D talitos_register_rng(dev); if (err) { dev_err(dev, "failed to register hwrng: %d\n", err); @@ -3428,7 +3299,8 @@ static int talitos_probe(struct platform_device *ofde= v) =20 /* register crypto algorithms the device supports */ for (i =3D 0; i < ARRAY_SIZE(driver_algs); i++) { - if (hw_supports(dev, driver_algs[i].desc_hdr_template)) { + if (talitos_hw_supports(dev, + driver_algs[i].desc_hdr_template)) { struct talitos_crypto_alg *t_alg; struct crypto_alg *alg =3D NULL; =20 diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index fa8c71b1f90f..81331914801b 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -5,7 +5,13 @@ * Copyright (c) 2006-2011 Freescale Semiconductor, Inc. */ =20 +#include +#include +#include +#include +#include #include +#include #include #include #include @@ -19,6 +25,13 @@ #define PRIMARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 28) & 0xf) #define SECONDARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 16) & 0xf) =20 +#ifdef CONFIG_CRYPTO_DEV_TALITOS2 +#define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA512_BLOCK_SIZE) +#else +#define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA256_BLOCK_SIZE) +#endif +#define TALITOS_MAX_IV_LENGTH 16 /* max of AES_BLOCK_SIZE, DES3_EDE_BLOCK= _SIZE */ + /* descriptor pointer entry */ struct talitos_ptr { union { @@ -174,6 +187,35 @@ struct talitos_private { =20 }; =20 +struct talitos_ctx { + struct device *dev; + int ch; + __be32 desc_hdr_template; + u8 key[TALITOS_MAX_KEY_SIZE]; + u8 iv[TALITOS_MAX_IV_LENGTH]; + dma_addr_t dma_key; + unsigned int keylen; + unsigned int enckeylen; + unsigned int authkeylen; +}; + +struct talitos_alg_template { + u32 type; + u32 priority; + union { + struct skcipher_alg skcipher; + struct ahash_alg hash; + struct aead_alg aead; + } alg; + __be32 desc_hdr_template; +}; + +struct talitos_crypto_alg { + struct list_head entry; + struct device *dev; + struct talitos_alg_template algt; +}; + /* .features flag */ #define TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT 0x00000001 #define TALITOS_FTR_HW_AUTH_CHECK 0x00000002 @@ -432,6 +474,131 @@ static inline bool has_ftr_sec1(struct talitos_privat= e *priv) #define DESC_PTR_LNKTBL_RET 0x02 #define DESC_PTR_LNKTBL_NEXT 0x01 =20 +static inline void to_talitos_ptr(struct talitos_ptr *ptr, dma_addr_t dma_= addr, + unsigned int len, bool is_sec1) +{ + ptr->ptr =3D cpu_to_be32(lower_32_bits(dma_addr)); + if (is_sec1) { + ptr->len1 =3D cpu_to_be16(len); + } else { + ptr->len =3D cpu_to_be16(len); + ptr->eptr =3D upper_32_bits(dma_addr); + } +} + +static inline void copy_talitos_ptr(struct talitos_ptr *dst_ptr, + struct talitos_ptr *src_ptr, bool is_sec1) +{ + dst_ptr->ptr =3D src_ptr->ptr; + if (is_sec1) { + dst_ptr->len1 =3D src_ptr->len1; + } else { + dst_ptr->len =3D src_ptr->len; + dst_ptr->eptr =3D src_ptr->eptr; + } +} + +static inline unsigned short from_talitos_ptr_len(struct talitos_ptr *ptr, + bool is_sec1) +{ + if (is_sec1) + return be16_to_cpu(ptr->len1); + else + return be16_to_cpu(ptr->len); +} + +static inline void to_talitos_ptr_ext_set(struct talitos_ptr *ptr, u8 val, + bool is_sec1) +{ + if (!is_sec1) + ptr->j_extent =3D val; +} + +static inline void to_talitos_ptr_ext_or(struct talitos_ptr *ptr, u8 val, + bool is_sec1) +{ + if (!is_sec1) + ptr->j_extent |=3D val; +} + +/* + * map virtual single (contiguous) pointer to h/w descriptor pointer + */ +static void __map_single_talitos_ptr(struct device *dev, + struct talitos_ptr *ptr, unsigned int len, + void *data, enum dma_data_direction dir, + unsigned long attrs) +{ + dma_addr_t dma_addr =3D dma_map_single_attrs(dev, data, len, dir, attrs); + struct talitos_private *priv =3D dev_get_drvdata(dev); + bool is_sec1 =3D has_ftr_sec1(priv); + + to_talitos_ptr(ptr, dma_addr, len, is_sec1); +} + +static inline void map_single_talitos_ptr(struct device *dev, + struct talitos_ptr *ptr, + unsigned int len, void *data, + enum dma_data_direction dir) +{ + __map_single_talitos_ptr(dev, ptr, len, data, dir, 0); +} + +static inline void map_single_talitos_ptr_nosync(struct device *dev, + struct talitos_ptr *ptr, + unsigned int len, void *data, + enum dma_data_direction dir) +{ + __map_single_talitos_ptr(dev, ptr, len, data, dir, + DMA_ATTR_SKIP_CPU_SYNC); +} + +/* + * unmap bus single (contiguous) h/w descriptor pointer + */ +static inline void unmap_single_talitos_ptr(struct device *dev, + struct talitos_ptr *ptr, + enum dma_data_direction dir) +{ + struct talitos_private *priv =3D dev_get_drvdata(dev); + bool is_sec1 =3D has_ftr_sec1(priv); + + dma_unmap_single(dev, be32_to_cpu(ptr->ptr), + from_talitos_ptr_len(ptr, is_sec1), dir); +} + +int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc, + void (*callback)(struct device *dev, + struct talitos_desc *desc, void *context, + int error), + void *context); + +void talitos_sg_unmap(struct device *dev, struct talitos_edesc *edesc, + struct scatterlist *src, struct scatterlist *dst, + unsigned int len, unsigned int offset); +int talitos_sg_map_ext(struct device *dev, struct scatterlist *src, + unsigned int len, struct talitos_edesc *edesc, + struct talitos_ptr *ptr, int sg_count, + unsigned int offset, int tbl_off, int elen, bool force, + int align); +int talitos_sg_map(struct device *dev, struct scatterlist *src, + unsigned int len, struct talitos_edesc *edesc, + struct talitos_ptr *ptr, int sg_count, unsigned int offset, + int tbl_off); + +struct talitos_edesc * +talitos_edesc_alloc(struct device *dev, struct scatterlist *src, + struct scatterlist *dst, u8 *iv, unsigned int assoclen, + unsigned int cryptlen, unsigned int authsize, + unsigned int ivsize, int icv_stashing, u32 cryptoflags, + bool encrypt); + +int talitos_hw_supports(struct device *dev, __be32 desc_hdr_template); + +int talitos_init_common(struct talitos_ctx *ctx, + struct talitos_crypto_alg *talitos_alg); +void talitos_cra_exit(struct crypto_tfm *tfm); + /* Hardware RNG */ =20 int talitos_register_rng(struct device *dev); --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E5D7381EAA; Tue, 21 Jul 2026 13:59:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642397; cv=none; b=dfKWnLuVH8jwSok51SmZN2tKGkGEapxEBE2k8TdxvCRBCN0bZVAiwd9rsjFpl0aMTyiDRa/UcKNQWk61v/W7A6ztn8gbvtIdPEfKYZhMeOyto3G4/1UX/1j8zyg2RPAxIKouUkbXYObkREJZmR08xm/u7pznhhzEUtmMrOOOJzQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642397; c=relaxed/simple; bh=wHulYPxXYpXvckhWYoFRLaVMVftejUA+9ZWXzr0Nk/0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bgrqjbYmQAySHcGQPojy1tzxqb1pA4nAd3mwNH8GLzNreyvKYcmtPCihojCkKUHXihtdJZXrSsFBOEdb0tESKdJdkJpMFUa/CQVnniGbelaxyNVUD7YwRacfgYsjeIyJBu99VYrCq3YUDxNeBL2kpoArnuDz/jb7qYX386Sku50= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=cNyAiS1K; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="cNyAiS1K" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 852254E40EA4; Tue, 21 Jul 2026 13:59:52 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 5339D60368; Tue, 21 Jul 2026 13:59:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id EA41111BD3BDA; Tue, 21 Jul 2026 15:59:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642391; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=tl5dts7vMtIL4YsEVkHORrutUzRLzw4cLGUFdbqjmbw=; b=cNyAiS1K+GHY37x4SOQdAbAxF5/uXOnNZbOCrRWuydVzDJmkHa2jstMSc/oqe8PtWsAJSQ YNkxZKbqDQckzKfrRl2e9k2lOnkpEPEC/TWPpTxw9FuD9P28lRsYlzOCAd3bLORkMQ4ttB S0GLIKJlgC4uGOb+FQlNqiSbYA+cSQJFsCMIF4ViY9DeBHa5oXSBsuvWEtUibtVC93kmJG 4JvJlHX0vxX4QB+LkyWiEjfxRc9dBW4iwAEGLhgJSLvoAUnY+Q2VYEqa5s3+csymqBisb2 0hmmfL5D6F5ZekJURZH7tM71HHY/A+HYKCD1f/1znjDK10J9kkgG4pwefk2k0w== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:33 +0200 Subject: [PATCH v3 06/19] crypto: talitos/hash - Move into separate file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-6-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=57005; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=wHulYPxXYpXvckhWYoFRLaVMVftejUA+9ZWXzr0Nk/0=; b=p//9U37Zagn/93zdt3XlpXuqav1OJIgMAjBFxi+5tD3PWGZBXF5VOp6UO4xsWCbDKuZVJq1co m6bDIE0/xZRDInUBr65uD5Q+XohMyhG35Zp0mruor89wS2aA75Trp62 X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Move the ahash algorithm implementations from talitos.c into a dedicated talitos-hash.c file. Add a helper that will be called in each crypto implementation file for registration. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/Makefile | 2 +- drivers/crypto/talitos/talitos-hash.c | 823 ++++++++++++++++++++++++++++++= ++ drivers/crypto/talitos/talitos.c | 851 +++---------------------------= ---- drivers/crypto/talitos/talitos.h | 7 + 4 files changed, 894 insertions(+), 789 deletions(-) diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile index 901ec681f010..40d37f9364ef 100644 --- a/drivers/crypto/talitos/Makefile +++ b/drivers/crypto/talitos/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D talitos.o =20 -talitos-y :=3D talitos.o talitos-rng.o +talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o diff --git a/drivers/crypto/talitos/talitos-hash.c b/drivers/crypto/talitos= /talitos-hash.c new file mode 100644 index 000000000000..bce9f9901ce8 --- /dev/null +++ b/drivers/crypto/talitos/talitos-hash.c @@ -0,0 +1,823 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +/* + * Freescale SEC (talitos) hash implementation + * + * Copyright (c) 2006-2011 Freescale Semiconductor, Inc. + */ + +#include + +#include +#include +#include +#include +#include + +#include "talitos.h" + +#define TALITOS_MDEU_MAX_CONTEXT_SIZE TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA= 512 + +struct talitos_ahash_req_ctx { + u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)]; + u8 padding_buf[64]; + u64 message_size; + unsigned int hw_context_size; + unsigned int swinit; + unsigned int first_request; + unsigned int last_request; + unsigned int to_hash_later; +}; + +struct talitos_export_state { + u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)]; + u64 message_size; + unsigned int swinit; + unsigned int first_request; + unsigned int last_request; + unsigned int to_hash_later; +}; + +static void common_nonsnoop_hash_unmap(struct device *dev, + struct talitos_edesc *edesc, + struct ahash_request *areq) +{ + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct talitos_private *priv =3D dev_get_drvdata(dev); + bool is_sec1 =3D has_ftr_sec1(priv); + struct talitos_desc *desc =3D &edesc->desc; + + unmap_single_talitos_ptr(dev, &desc->ptr[5], DMA_FROM_DEVICE); + + if (edesc->last && req_ctx->last_request) + memcpy(areq->result, req_ctx->hw_context, + crypto_ahash_digestsize(tfm)); + + if (edesc->src) + talitos_sg_unmap(dev, edesc, edesc->src, NULL, 0, 0); + + /* When using hashctx-in, must unmap it. */ + if (from_talitos_ptr_len(&desc->ptr[1], is_sec1)) + unmap_single_talitos_ptr(dev, &desc->ptr[1], + DMA_TO_DEVICE); + + if (edesc->dma_len) + dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len, + DMA_BIDIRECTIONAL); +} + +static void free_edesc_list_from(struct ahash_request *areq, struct talito= s_edesc *edesc) +{ + struct talitos_ctx *ctx =3D crypto_ahash_ctx(crypto_ahash_reqtfm(areq)); + struct talitos_edesc *next; + + while (edesc) { + next =3D edesc->next_desc; + common_nonsnoop_hash_unmap(ctx->dev, edesc, areq); + kfree(edesc); + edesc =3D next; + } +} + +static void ahash_done(struct device *dev, + struct talitos_desc *desc, void *context, + int err) +{ + struct ahash_request *areq =3D context; + struct talitos_edesc *edesc =3D + container_of(desc, struct talitos_edesc, desc); + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + bool is_sec1 =3D has_ftr_sec1(dev_get_drvdata(dev)); + struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); + struct talitos_edesc *next; + + if (is_sec1) { + free_edesc_list_from(areq, edesc); + ahash_request_complete(areq, err ?: req_ctx->to_hash_later); + } else { + next =3D edesc->next_desc; + + common_nonsnoop_hash_unmap(dev, edesc, areq); + kfree(edesc); + + if (err) + goto out; + + if (next) { + err =3D talitos_submit(dev, ctx->ch, &next->desc, + ahash_done, areq); + if (err !=3D -EINPROGRESS) + goto out; + return; + } +out: + if (err && next) + free_edesc_list_from(areq, next); + ahash_request_complete(areq, err ?: req_ctx->to_hash_later); + } +} + +/* + * SEC1 doesn't like hashing of 0 sized message, so we do the padding + * ourself and submit a padded block + */ +static void talitos_handle_buggy_hash(struct talitos_ahash_req_ctx *req_ct= x, + struct talitos_ctx *ctx, + struct talitos_edesc *edesc, + struct talitos_ptr *ptr) +{ + __be64 len =3D cpu_to_be64(req_ctx->message_size << 3); + + memset(req_ctx->padding_buf, 0, sizeof(req_ctx->padding_buf)); + req_ctx->padding_buf[0] =3D 0x80; + memcpy(&req_ctx->padding_buf[56], &len, sizeof(len)); + + pr_err_once("Bug in SEC1, padding ourself\n"); + edesc->desc.hdr &=3D ~DESC_HDR_MODE0_MDEU_PAD; + map_single_talitos_ptr(ctx->dev, ptr, sizeof(req_ctx->padding_buf), + (char *)req_ctx->padding_buf, DMA_TO_DEVICE); +} + +static void common_nonsnoop_hash(struct talitos_edesc *edesc, + struct ahash_request *areq, + unsigned int length) +{ + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + struct device *dev =3D ctx->dev; + struct talitos_desc *desc =3D &edesc->desc; + bool sync_needed =3D false; + struct talitos_private *priv =3D dev_get_drvdata(dev); + bool is_sec1 =3D has_ftr_sec1(priv); + int sg_count; + + /* first DWORD empty */ + + /* hash context in */ + if (!edesc->first || !req_ctx->first_request || req_ctx->swinit) { + map_single_talitos_ptr_nosync(dev, &desc->ptr[1], + req_ctx->hw_context_size, + req_ctx->hw_context, + DMA_TO_DEVICE); + req_ctx->swinit =3D 0; + } + /* Indicate next op is not the first. */ + req_ctx->first_request =3D 0; + + /* HMAC key */ + if (ctx->keylen) + to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen, + is_sec1); + + sg_count =3D edesc->src_nents ?: 1; + if (is_sec1 && sg_count > 1) + sg_copy_to_buffer(edesc->src, sg_count, edesc->buf, length); + else if (length) + sg_count =3D dma_map_sg(dev, edesc->src, sg_count, DMA_TO_DEVICE); + + /* + * data in + */ + sg_count =3D talitos_sg_map(dev, edesc->src, length, edesc, &desc->ptr[3], + sg_count, 0, 0); + if (sg_count > 1) + sync_needed =3D true; + + /* fifth DWORD empty */ + + /* hash/HMAC out -or- hash context out */ + if (edesc->last && req_ctx->last_request) + map_single_talitos_ptr(dev, &desc->ptr[5], + crypto_ahash_digestsize(tfm), + req_ctx->hw_context, DMA_FROM_DEVICE); + else + map_single_talitos_ptr_nosync(dev, &desc->ptr[5], + req_ctx->hw_context_size, + req_ctx->hw_context, + DMA_FROM_DEVICE); + + /* last DWORD empty */ + + if (is_sec1 && from_talitos_ptr_len(&desc->ptr[3], true) =3D=3D 0) + talitos_handle_buggy_hash(req_ctx, ctx, edesc, &desc->ptr[3]); + + if (sync_needed) + dma_sync_single_for_device(dev, edesc->dma_link_tbl, + edesc->dma_len, DMA_BIDIRECTIONAL); +} + +static struct talitos_edesc *ahash_edesc_alloc(struct ahash_request *areq, + struct scatterlist *src, + unsigned int nbytes) +{ + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); + + return talitos_edesc_alloc(ctx->dev, src, NULL, NULL, 0, + nbytes, 0, 0, 0, areq->base.flags, false); +} + +static struct talitos_edesc * +ahash_process_req_prepare(struct ahash_request *areq, unsigned int nbytes, + unsigned int blocksize, bool is_sec1) +{ + struct talitos_ctx *ctx =3D crypto_ahash_ctx(crypto_ahash_reqtfm(areq)); + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + struct talitos_edesc *first =3D NULL, *prev_edesc =3D NULL, *edesc; + size_t desc_max =3D is_sec1 ? TALITOS1_MAX_DATA_LEN : + TALITOS2_MAX_DATA_LEN; + struct scatterlist tmp[2]; + size_t to_hash_this_desc; + struct scatterlist *src; + size_t offset =3D 0; + + do { + src =3D scatterwalk_ffwd(tmp, areq->src, offset); + + to_hash_this_desc =3D + min(nbytes, ALIGN_DOWN(desc_max, blocksize)); + + /* Allocate extended descriptor */ + edesc =3D ahash_edesc_alloc(areq, src, to_hash_this_desc); + if (IS_ERR(edesc)) { + if (first) + free_edesc_list_from(areq, first); + return edesc; + } + + edesc->src =3D scatterwalk_ffwd(edesc->bufsl, areq->src, offset); + edesc->desc.hdr =3D ctx->desc_hdr_template; + edesc->first =3D offset =3D=3D 0; + edesc->last =3D nbytes - to_hash_this_desc =3D=3D 0; + + /* On last one, request SEC to pad; otherwise continue */ + if (req_ctx->last_request && edesc->last) + edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_PAD; + else + edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_CONT; + + /* request SEC to INIT hash. */ + if (req_ctx->first_request && edesc->first && !req_ctx->swinit) + edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_INIT; + + /* + * When the tfm context has a keylen, it's an HMAC. + * A first or last (ie. not middle) descriptor must request HMAC. + */ + if (ctx->keylen && ((req_ctx->first_request && edesc->first) || + (req_ctx->last_request && edesc->last))) + edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_HMAC; + + /* clear the DN bit */ + if (is_sec1 && !edesc->last) + edesc->desc.hdr &=3D ~DESC_HDR_DONE_NOTIFY; + + common_nonsnoop_hash(edesc, areq, to_hash_this_desc); + + offset +=3D to_hash_this_desc; + nbytes -=3D to_hash_this_desc; + + if (!prev_edesc) + first =3D edesc; + else + prev_edesc->next_desc =3D edesc; + prev_edesc =3D edesc; + } while (nbytes); + + return first; +} + +static int ahash_process_req(struct ahash_request *areq, unsigned int nbyt= es) +{ + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + struct talitos_edesc *edesc; + unsigned int blocksize =3D + crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm)); + bool is_sec1 =3D has_ftr_sec1(dev_get_drvdata(ctx->dev)); + unsigned int nbytes_to_hash; + unsigned int to_hash_later; + struct device *dev =3D ctx->dev; + int ret; + + nbytes_to_hash =3D ALIGN_DOWN(nbytes, blocksize); + to_hash_later =3D nbytes - nbytes_to_hash; + + if (req_ctx->last_request) { + nbytes_to_hash =3D nbytes; + to_hash_later =3D 0; + } + + req_ctx->to_hash_later =3D to_hash_later; + + edesc =3D ahash_process_req_prepare(areq, nbytes_to_hash, blocksize, + is_sec1); + if (IS_ERR(edesc)) + return PTR_ERR(edesc); + + ret =3D talitos_submit(dev, ctx->ch, &edesc->desc, ahash_done, areq); + if (ret !=3D -EINPROGRESS) + free_edesc_list_from(areq, edesc); + + return ret; +} + +static int ahash_init(struct ahash_request *areq) +{ + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); + struct device *dev =3D ctx->dev; + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + unsigned int size; + dma_addr_t dma; + + /* Initialize the context */ + req_ctx->first_request =3D 1; + req_ctx->swinit =3D 0; /* assume h/w init of context */ + size =3D (crypto_ahash_digestsize(tfm) <=3D SHA256_DIGEST_SIZE) + ? TALITOS_MDEU_CONTEXT_SIZE_MD5_SHA1_SHA256 + : TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512; + req_ctx->hw_context_size =3D size; + req_ctx->last_request =3D 0; + + dma =3D dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size, + DMA_TO_DEVICE); + dma_unmap_single(dev, dma, req_ctx->hw_context_size, DMA_TO_DEVICE); + + return 0; +} + +/* + * on h/w without explicit sha224 support, we initialize h/w context + * manually with sha224 constants, and tell it to run sha256. + */ +static int ahash_init_sha224_swinit(struct ahash_request *areq) +{ + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + + req_ctx->hw_context[0] =3D SHA224_H0; + req_ctx->hw_context[1] =3D SHA224_H1; + req_ctx->hw_context[2] =3D SHA224_H2; + req_ctx->hw_context[3] =3D SHA224_H3; + req_ctx->hw_context[4] =3D SHA224_H4; + req_ctx->hw_context[5] =3D SHA224_H5; + req_ctx->hw_context[6] =3D SHA224_H6; + req_ctx->hw_context[7] =3D SHA224_H7; + + /* init 64-bit count */ + req_ctx->hw_context[8] =3D 0; + req_ctx->hw_context[9] =3D 0; + + ahash_init(areq); + req_ctx->swinit =3D 1;/* prevent h/w initting context with sha256 values*/ + + return 0; +} + +static int ahash_update(struct ahash_request *areq) +{ + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + + req_ctx->last_request =3D 0; + + return ahash_process_req(areq, areq->nbytes); +} + +static int ahash_final(struct ahash_request *areq) +{ + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + + req_ctx->last_request =3D 1; + + return ahash_process_req(areq, 0); +} + +static int ahash_finup(struct ahash_request *areq) +{ + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + + req_ctx->last_request =3D 1; + + return ahash_process_req(areq, areq->nbytes); +} + +static int ahash_digest(struct ahash_request *areq) +{ + ahash_init(areq); + return ahash_finup(areq); +} + +static int ahash_digest_sha224_swinit(struct ahash_request *areq) +{ + ahash_init_sha224_swinit(areq); + return ahash_finup(areq); +} + +static int ahash_export(struct ahash_request *areq, void *out) +{ + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + struct talitos_export_state *export =3D out; + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); + struct device *dev =3D ctx->dev; + dma_addr_t dma; + + dma =3D dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size, + DMA_FROM_DEVICE); + dma_unmap_single(dev, dma, req_ctx->hw_context_size, DMA_FROM_DEVICE); + + memcpy(export->hw_context, req_ctx->hw_context, + req_ctx->hw_context_size); + export->swinit =3D req_ctx->swinit; + export->first_request =3D req_ctx->first_request; + export->last_request =3D req_ctx->last_request; + export->to_hash_later =3D req_ctx->to_hash_later; + export->message_size =3D req_ctx->message_size; + + return 0; +} + +static int ahash_import(struct ahash_request *areq, const void *in) +{ + struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); + struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); + struct device *dev =3D ctx->dev; + const struct talitos_export_state *export =3D in; + unsigned int size; + dma_addr_t dma; + + memset(req_ctx, 0, sizeof(*req_ctx)); + size =3D (crypto_ahash_digestsize(tfm) <=3D SHA256_DIGEST_SIZE) + ? TALITOS_MDEU_CONTEXT_SIZE_MD5_SHA1_SHA256 + : TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512; + req_ctx->hw_context_size =3D size; + memcpy(req_ctx->hw_context, export->hw_context, size); + req_ctx->swinit =3D export->swinit; + req_ctx->first_request =3D export->first_request; + req_ctx->last_request =3D export->last_request; + req_ctx->to_hash_later =3D export->to_hash_later; + req_ctx->message_size =3D export->message_size; + + dma =3D dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size, + DMA_TO_DEVICE); + dma_unmap_single(dev, dma, req_ctx->hw_context_size, DMA_TO_DEVICE); + + return 0; +} + +static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int k= eylen, + u8 *hash) +{ + struct talitos_ctx *ctx =3D crypto_tfm_ctx(crypto_ahash_tfm(tfm)); + + struct scatterlist sg[1]; + struct ahash_request *req; + struct crypto_wait wait; + int ret; + + crypto_init_wait(&wait); + + req =3D ahash_request_alloc(tfm, GFP_KERNEL); + if (!req) + return -ENOMEM; + + /* Keep tfm keylen =3D=3D 0 during hash of the long key */ + ctx->keylen =3D 0; + ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, + crypto_req_done, &wait); + + sg_init_one(&sg[0], key, keylen); + + ahash_request_set_crypt(req, sg, hash, keylen); + ret =3D crypto_wait_req(crypto_ahash_digest(req), &wait); + + ahash_request_free(req); + + return ret; +} + +static int ahash_setkey(struct crypto_ahash *tfm, const u8 *key, + unsigned int keylen) +{ + struct talitos_ctx *ctx =3D crypto_tfm_ctx(crypto_ahash_tfm(tfm)); + struct device *dev =3D ctx->dev; + unsigned int blocksize =3D + crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm)); + unsigned int digestsize =3D crypto_ahash_digestsize(tfm); + unsigned int keysize =3D keylen; + u8 hash[SHA512_DIGEST_SIZE]; + int ret; + + if (keylen <=3D blocksize) + memcpy(ctx->key, key, keysize); + else { + /* Must get the hash of the long key */ + ret =3D keyhash(tfm, key, keylen, hash); + + if (ret) + return -EINVAL; + + keysize =3D digestsize; + memcpy(ctx->key, hash, digestsize); + } + + if (ctx->keylen) + dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); + + ctx->keylen =3D keysize; + ctx->dma_key =3D dma_map_single(dev, ctx->key, keysize, DMA_TO_DEVICE); + + return 0; +} + +static int talitos_cra_init_ahash(struct crypto_tfm *tfm) +{ + struct crypto_alg *alg =3D tfm->__crt_alg; + struct talitos_crypto_alg *talitos_alg; + struct talitos_ctx *ctx =3D crypto_tfm_ctx(tfm); + + talitos_alg =3D container_of(__crypto_ahash_alg(alg), + struct talitos_crypto_alg, + algt.alg.hash); + + ctx->keylen =3D 0; + + return talitos_init_common(ctx, talitos_alg); +} + +static struct talitos_alg_template hash_driver_algs[] =3D { + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D MD5_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "md5", + .cra_driver_name =3D "md5-talitos", + .cra_blocksize =3D MD5_HMAC_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_MD5, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA1_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "sha1", + .cra_driver_name =3D "sha1-talitos", + .cra_blocksize =3D SHA1_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA1, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA224_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "sha224", + .cra_driver_name =3D "sha224-talitos", + .cra_blocksize =3D SHA224_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA224, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA256_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "sha256", + .cra_driver_name =3D "sha256-talitos", + .cra_blocksize =3D SHA256_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA256, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA384_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "sha384", + .cra_driver_name =3D "sha384-talitos", + .cra_blocksize =3D SHA384_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUB | + DESC_HDR_MODE0_MDEUB_SHA384, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA512_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "sha512", + .cra_driver_name =3D "sha512-talitos", + .cra_blocksize =3D SHA512_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUB | + DESC_HDR_MODE0_MDEUB_SHA512, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D MD5_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "hmac(md5)", + .cra_driver_name =3D "hmac-md5-talitos", + .cra_blocksize =3D MD5_HMAC_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_MD5, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA1_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "hmac(sha1)", + .cra_driver_name =3D "hmac-sha1-talitos", + .cra_blocksize =3D SHA1_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA1, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA224_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "hmac(sha224)", + .cra_driver_name =3D "hmac-sha224-talitos", + .cra_blocksize =3D SHA224_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA224, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA256_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "hmac(sha256)", + .cra_driver_name =3D "hmac-sha256-talitos", + .cra_blocksize =3D SHA256_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA256, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA384_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "hmac(sha384)", + .cra_driver_name =3D "hmac-sha384-talitos", + .cra_blocksize =3D SHA384_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUB | + DESC_HDR_MODE0_MDEUB_SHA384, + }, + { .type =3D CRYPTO_ALG_TYPE_AHASH, + .alg.hash =3D { + .halg.digestsize =3D SHA512_DIGEST_SIZE, + .halg.statesize =3D sizeof(struct talitos_export_state), + .halg.base =3D { + .cra_name =3D "hmac(sha512)", + .cra_driver_name =3D "hmac-sha512-talitos", + .cra_blocksize =3D SHA512_BLOCK_SIZE, + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY | + CRYPTO_AHASH_ALG_BLOCK_ONLY, + } + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUB | + DESC_HDR_MODE0_MDEUB_SHA512, + } +}; + +int talitos_register_hash(struct device *dev) +{ + struct talitos_private *priv =3D dev_get_drvdata(dev); + struct ahash_alg *ahash_alg; + struct crypto_alg *alg; + size_t i; + int ret; + + for (i =3D 0; i < ARRAY_SIZE(hash_driver_algs); i++) { + if (!talitos_hw_supports(dev, + hash_driver_algs[i].desc_hdr_template)) + continue; + + ahash_alg =3D &hash_driver_algs[i].alg.hash; + alg =3D &ahash_alg->halg.base; + + alg->cra_init =3D talitos_cra_init_ahash; + alg->cra_exit =3D talitos_cra_exit; + ahash_alg->init =3D ahash_init; + ahash_alg->update =3D ahash_update; + ahash_alg->final =3D ahash_final; + ahash_alg->finup =3D ahash_finup; + ahash_alg->digest =3D ahash_digest; + if (!strncmp(alg->cra_name, "hmac", 4)) + ahash_alg->setkey =3D ahash_setkey; + ahash_alg->import =3D ahash_import; + ahash_alg->export =3D ahash_export; + + if (!(priv->features & TALITOS_FTR_HMAC_OK) && + !strncmp(alg->cra_name, "hmac", 4)) { + /* not supported */ + continue; + } + + if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) && + (!strcmp(alg->cra_name, "sha224") || + !strcmp(alg->cra_name, "hmac(sha224)"))) { + ahash_alg->init =3D ahash_init_sha224_swinit; + ahash_alg->digest =3D ahash_digest_sha224_swinit; + hash_driver_algs[i].desc_hdr_template =3D + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA256; + } + + ret =3D talitos_register_common(dev, &hash_driver_algs[i]); + if (ret) + return ret; + } + + return 0; +} diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index dc92b98ec5ef..2d5688b1c81e 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -738,28 +738,6 @@ DEF_TALITOS2_INTERRUPT(ch1_3, TALITOS2_ISR_CH_1_3_DONE= , TALITOS2_ISR_CH_1_3_ERR, */ #define TALITOS_CRA_PRIORITY_AEAD_HSNA (TALITOS_CRA_PRIORITY - 1) =20 -#define TALITOS_MDEU_MAX_CONTEXT_SIZE TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA= 512 - -struct talitos_ahash_req_ctx { - u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)]; - u8 padding_buf[64]; - u64 message_size; - unsigned int hw_context_size; - unsigned int swinit; - unsigned int first_request; - unsigned int last_request; - unsigned int to_hash_later; -}; - -struct talitos_export_state { - u32 hw_context[TALITOS_MDEU_MAX_CONTEXT_SIZE / sizeof(u32)]; - u64 message_size; - unsigned int swinit; - unsigned int first_request; - unsigned int last_request; - unsigned int to_hash_later; -}; - static int aead_setkey(struct crypto_aead *authenc, const u8 *key, unsigned int keylen) { @@ -1568,503 +1546,6 @@ static int skcipher_decrypt(struct skcipher_request= *areq) return common_nonsnoop(edesc, areq, skcipher_done); } =20 -static void common_nonsnoop_hash_unmap(struct device *dev, - struct talitos_edesc *edesc, - struct ahash_request *areq) -{ - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); - struct talitos_desc *desc =3D &edesc->desc; - - unmap_single_talitos_ptr(dev, &desc->ptr[5], DMA_FROM_DEVICE); - - if (edesc->last && req_ctx->last_request) - memcpy(areq->result, req_ctx->hw_context, - crypto_ahash_digestsize(tfm)); - - if (edesc->src) - talitos_sg_unmap(dev, edesc, edesc->src, NULL, 0, 0); - - /* When using hashctx-in, must unmap it. */ - if (from_talitos_ptr_len(&desc->ptr[1], is_sec1)) - unmap_single_talitos_ptr(dev, &desc->ptr[1], - DMA_TO_DEVICE); - - if (edesc->dma_len) - dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len, - DMA_BIDIRECTIONAL); -} - -static void free_edesc_list_from(struct ahash_request *areq, struct talito= s_edesc *edesc) -{ - struct talitos_ctx *ctx =3D crypto_ahash_ctx(crypto_ahash_reqtfm(areq)); - struct talitos_edesc *next; - - while (edesc) { - next =3D edesc->next_desc; - common_nonsnoop_hash_unmap(ctx->dev, edesc, areq); - kfree(edesc); - edesc =3D next; - } -} - -static void ahash_done(struct device *dev, - struct talitos_desc *desc, void *context, - int err) -{ - struct ahash_request *areq =3D context; - struct talitos_edesc *edesc =3D - container_of(desc, struct talitos_edesc, desc); - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - bool is_sec1 =3D has_ftr_sec1(dev_get_drvdata(dev)); - struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); - struct talitos_edesc *next; - - if (is_sec1) { - free_edesc_list_from(areq, edesc); - ahash_request_complete(areq, err ?: req_ctx->to_hash_later); - } else { - next =3D edesc->next_desc; - - common_nonsnoop_hash_unmap(dev, edesc, areq); - kfree(edesc); - - if (err) - goto out; - - if (next) { - err =3D talitos_submit(dev, ctx->ch, &next->desc, - ahash_done, areq); - if (err !=3D -EINPROGRESS) - goto out; - return; - } -out: - if (err && next) - free_edesc_list_from(areq, next); - ahash_request_complete(areq, err ?: req_ctx->to_hash_later); - } -} - -/* - * SEC1 doesn't like hashing of 0 sized message, so we do the padding - * ourself and submit a padded block - */ -static void talitos_handle_buggy_hash(struct talitos_ahash_req_ctx *req_ct= x, - struct talitos_ctx *ctx, - struct talitos_edesc *edesc, - struct talitos_ptr *ptr) -{ - __be64 len =3D cpu_to_be64(req_ctx->message_size << 3); - - memset(req_ctx->padding_buf, 0, sizeof(req_ctx->padding_buf)); - req_ctx->padding_buf[0] =3D 0x80; - memcpy(&req_ctx->padding_buf[56], &len, sizeof(len)); - - pr_err_once("Bug in SEC1, padding ourself\n"); - edesc->desc.hdr &=3D ~DESC_HDR_MODE0_MDEU_PAD; - map_single_talitos_ptr(ctx->dev, ptr, sizeof(req_ctx->padding_buf), - (char *)req_ctx->padding_buf, DMA_TO_DEVICE); -} - -static void common_nonsnoop_hash(struct talitos_edesc *edesc, - struct ahash_request *areq, - unsigned int length) -{ - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - struct device *dev =3D ctx->dev; - struct talitos_desc *desc =3D &edesc->desc; - bool sync_needed =3D false; - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); - int sg_count; - - /* first DWORD empty */ - - /* hash context in */ - if (!edesc->first || !req_ctx->first_request || req_ctx->swinit) { - map_single_talitos_ptr_nosync(dev, &desc->ptr[1], - req_ctx->hw_context_size, - req_ctx->hw_context, - DMA_TO_DEVICE); - req_ctx->swinit =3D 0; - } - /* Indicate next op is not the first. */ - req_ctx->first_request =3D 0; - - /* HMAC key */ - if (ctx->keylen) - to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen, - is_sec1); - - sg_count =3D edesc->src_nents ?: 1; - if (is_sec1 && sg_count > 1) - sg_copy_to_buffer(edesc->src, sg_count, edesc->buf, length); - else if (length) - sg_count =3D dma_map_sg(dev, edesc->src, sg_count, DMA_TO_DEVICE); - - /* - * data in - */ - sg_count =3D talitos_sg_map(dev, edesc->src, length, edesc, &desc->ptr[3], - sg_count, 0, 0); - if (sg_count > 1) - sync_needed =3D true; - - /* fifth DWORD empty */ - - /* hash/HMAC out -or- hash context out */ - if (edesc->last && req_ctx->last_request) - map_single_talitos_ptr(dev, &desc->ptr[5], - crypto_ahash_digestsize(tfm), - req_ctx->hw_context, DMA_FROM_DEVICE); - else - map_single_talitos_ptr_nosync(dev, &desc->ptr[5], - req_ctx->hw_context_size, - req_ctx->hw_context, - DMA_FROM_DEVICE); - - /* last DWORD empty */ - - if (is_sec1 && from_talitos_ptr_len(&desc->ptr[3], true) =3D=3D 0) - talitos_handle_buggy_hash(req_ctx, ctx, edesc, &desc->ptr[3]); - - if (sync_needed) - dma_sync_single_for_device(dev, edesc->dma_link_tbl, - edesc->dma_len, DMA_BIDIRECTIONAL); -} - -static struct talitos_edesc *ahash_edesc_alloc(struct ahash_request *areq, - struct scatterlist *src, - unsigned int nbytes) -{ - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); - - return talitos_edesc_alloc(ctx->dev, src, NULL, NULL, 0, - nbytes, 0, 0, 0, areq->base.flags, false); -} - -static struct talitos_edesc * -ahash_process_req_prepare(struct ahash_request *areq, unsigned int nbytes, - unsigned int blocksize, bool is_sec1) -{ - struct talitos_ctx *ctx =3D crypto_ahash_ctx(crypto_ahash_reqtfm(areq)); - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - struct talitos_edesc *first =3D NULL, *prev_edesc =3D NULL, *edesc; - size_t desc_max =3D is_sec1 ? TALITOS1_MAX_DATA_LEN : - TALITOS2_MAX_DATA_LEN; - struct scatterlist tmp[2]; - size_t to_hash_this_desc; - struct scatterlist *src; - size_t offset =3D 0; - - do { - src =3D scatterwalk_ffwd(tmp, areq->src, offset); - - to_hash_this_desc =3D - min(nbytes, ALIGN_DOWN(desc_max, blocksize)); - - /* Allocate extended descriptor */ - edesc =3D ahash_edesc_alloc(areq, src, to_hash_this_desc); - if (IS_ERR(edesc)) { - if (first) - free_edesc_list_from(areq, first); - return edesc; - } - - edesc->src =3D scatterwalk_ffwd(edesc->bufsl, areq->src, offset); - edesc->desc.hdr =3D ctx->desc_hdr_template; - edesc->first =3D offset =3D=3D 0; - edesc->last =3D nbytes - to_hash_this_desc =3D=3D 0; - - /* On last one, request SEC to pad; otherwise continue */ - if (req_ctx->last_request && edesc->last) - edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_PAD; - else - edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_CONT; - - /* request SEC to INIT hash. */ - if (req_ctx->first_request && edesc->first && !req_ctx->swinit) - edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_INIT; - - /* - * When the tfm context has a keylen, it's an HMAC. - * A first or last (ie. not middle) descriptor must request HMAC. - */ - if (ctx->keylen && ((req_ctx->first_request && edesc->first) || - (req_ctx->last_request && edesc->last))) - edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_HMAC; - - /* clear the DN bit */ - if (is_sec1 && !edesc->last) - edesc->desc.hdr &=3D ~DESC_HDR_DONE_NOTIFY; - - common_nonsnoop_hash(edesc, areq, to_hash_this_desc); - - offset +=3D to_hash_this_desc; - nbytes -=3D to_hash_this_desc; - - if (!prev_edesc) - first =3D edesc; - else - prev_edesc->next_desc =3D edesc; - prev_edesc =3D edesc; - } while (nbytes); - - return first; -} - -static int ahash_process_req(struct ahash_request *areq, unsigned int nbyt= es) -{ - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - struct talitos_edesc *edesc; - unsigned int blocksize =3D - crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm)); - bool is_sec1 =3D has_ftr_sec1(dev_get_drvdata(ctx->dev)); - unsigned int nbytes_to_hash; - unsigned int to_hash_later; - struct device *dev =3D ctx->dev; - int ret; - - nbytes_to_hash =3D ALIGN_DOWN(nbytes, blocksize); - to_hash_later =3D nbytes - nbytes_to_hash; - - if (req_ctx->last_request) { - nbytes_to_hash =3D nbytes; - to_hash_later =3D 0; - } - - req_ctx->to_hash_later =3D to_hash_later; - - edesc =3D ahash_process_req_prepare(areq, nbytes_to_hash, blocksize, - is_sec1); - if (IS_ERR(edesc)) - return PTR_ERR(edesc); - - ret =3D talitos_submit(dev, ctx->ch, &edesc->desc, ahash_done, areq); - if (ret !=3D -EINPROGRESS) - free_edesc_list_from(areq, edesc); - - return ret; -} - -static int ahash_init(struct ahash_request *areq) -{ - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); - struct device *dev =3D ctx->dev; - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - unsigned int size; - dma_addr_t dma; - - /* Initialize the context */ - req_ctx->first_request =3D 1; - req_ctx->swinit =3D 0; /* assume h/w init of context */ - size =3D (crypto_ahash_digestsize(tfm) <=3D SHA256_DIGEST_SIZE) - ? TALITOS_MDEU_CONTEXT_SIZE_MD5_SHA1_SHA256 - : TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512; - req_ctx->hw_context_size =3D size; - req_ctx->last_request =3D 0; - - dma =3D dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size, - DMA_TO_DEVICE); - dma_unmap_single(dev, dma, req_ctx->hw_context_size, DMA_TO_DEVICE); - - return 0; -} - -/* - * on h/w without explicit sha224 support, we initialize h/w context - * manually with sha224 constants, and tell it to run sha256. - */ -static int ahash_init_sha224_swinit(struct ahash_request *areq) -{ - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - - req_ctx->hw_context[0] =3D SHA224_H0; - req_ctx->hw_context[1] =3D SHA224_H1; - req_ctx->hw_context[2] =3D SHA224_H2; - req_ctx->hw_context[3] =3D SHA224_H3; - req_ctx->hw_context[4] =3D SHA224_H4; - req_ctx->hw_context[5] =3D SHA224_H5; - req_ctx->hw_context[6] =3D SHA224_H6; - req_ctx->hw_context[7] =3D SHA224_H7; - - /* init 64-bit count */ - req_ctx->hw_context[8] =3D 0; - req_ctx->hw_context[9] =3D 0; - - ahash_init(areq); - req_ctx->swinit =3D 1;/* prevent h/w initting context with sha256 values*/ - - return 0; -} - -static int ahash_update(struct ahash_request *areq) -{ - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - - req_ctx->last_request =3D 0; - - return ahash_process_req(areq, areq->nbytes); -} - -static int ahash_final(struct ahash_request *areq) -{ - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - - req_ctx->last_request =3D 1; - - return ahash_process_req(areq, 0); -} - -static int ahash_finup(struct ahash_request *areq) -{ - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - - req_ctx->last_request =3D 1; - - return ahash_process_req(areq, areq->nbytes); -} - -static int ahash_digest(struct ahash_request *areq) -{ - ahash_init(areq); - return ahash_finup(areq); -} - -static int ahash_digest_sha224_swinit(struct ahash_request *areq) -{ - ahash_init_sha224_swinit(areq); - return ahash_finup(areq); -} - -static int ahash_export(struct ahash_request *areq, void *out) -{ - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - struct talitos_export_state *export =3D out; - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); - struct device *dev =3D ctx->dev; - dma_addr_t dma; - - dma =3D dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size, - DMA_FROM_DEVICE); - dma_unmap_single(dev, dma, req_ctx->hw_context_size, DMA_FROM_DEVICE); - - memcpy(export->hw_context, req_ctx->hw_context, - req_ctx->hw_context_size); - export->swinit =3D req_ctx->swinit; - export->first_request =3D req_ctx->first_request; - export->last_request =3D req_ctx->last_request; - export->to_hash_later =3D req_ctx->to_hash_later; - export->message_size =3D req_ctx->message_size; - - return 0; -} - -static int ahash_import(struct ahash_request *areq, const void *in) -{ - struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); - struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); - struct device *dev =3D ctx->dev; - const struct talitos_export_state *export =3D in; - unsigned int size; - dma_addr_t dma; - - memset(req_ctx, 0, sizeof(*req_ctx)); - size =3D (crypto_ahash_digestsize(tfm) <=3D SHA256_DIGEST_SIZE) - ? TALITOS_MDEU_CONTEXT_SIZE_MD5_SHA1_SHA256 - : TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512; - req_ctx->hw_context_size =3D size; - memcpy(req_ctx->hw_context, export->hw_context, size); - req_ctx->swinit =3D export->swinit; - req_ctx->first_request =3D export->first_request; - req_ctx->last_request =3D export->last_request; - req_ctx->to_hash_later =3D export->to_hash_later; - req_ctx->message_size =3D export->message_size; - - dma =3D dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size, - DMA_TO_DEVICE); - dma_unmap_single(dev, dma, req_ctx->hw_context_size, DMA_TO_DEVICE); - - return 0; -} - -static int keyhash(struct crypto_ahash *tfm, const u8 *key, unsigned int k= eylen, - u8 *hash) -{ - struct talitos_ctx *ctx =3D crypto_tfm_ctx(crypto_ahash_tfm(tfm)); - - struct scatterlist sg[1]; - struct ahash_request *req; - struct crypto_wait wait; - int ret; - - crypto_init_wait(&wait); - - req =3D ahash_request_alloc(tfm, GFP_KERNEL); - if (!req) - return -ENOMEM; - - /* Keep tfm keylen =3D=3D 0 during hash of the long key */ - ctx->keylen =3D 0; - ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, - crypto_req_done, &wait); - - sg_init_one(&sg[0], key, keylen); - - ahash_request_set_crypt(req, sg, hash, keylen); - ret =3D crypto_wait_req(crypto_ahash_digest(req), &wait); - - ahash_request_free(req); - - return ret; -} - -static int ahash_setkey(struct crypto_ahash *tfm, const u8 *key, - unsigned int keylen) -{ - struct talitos_ctx *ctx =3D crypto_tfm_ctx(crypto_ahash_tfm(tfm)); - struct device *dev =3D ctx->dev; - unsigned int blocksize =3D - crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm)); - unsigned int digestsize =3D crypto_ahash_digestsize(tfm); - unsigned int keysize =3D keylen; - u8 hash[SHA512_DIGEST_SIZE]; - int ret; - - if (keylen <=3D blocksize) - memcpy(ctx->key, key, keysize); - else { - /* Must get the hash of the long key */ - ret =3D keyhash(tfm, key, keylen, hash); - - if (ret) - return -EINVAL; - - keysize =3D digestsize; - memcpy(ctx->key, hash, digestsize); - } - - if (ctx->keylen) - dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); - - ctx->keylen =3D keysize; - ctx->dma_key =3D dma_map_single(dev, ctx->key, keysize, DMA_TO_DEVICE); - - return 0; -} - static struct talitos_alg_template driver_algs[] =3D { /* AEAD algorithms. These use a single-pass ipsec_esp descriptor */ { .type =3D CRYPTO_ALG_TYPE_AEAD, @@ -2648,223 +2129,6 @@ static struct talitos_alg_template driver_algs[] = =3D { DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES, }, - /* AHASH algorithms. */ - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D MD5_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "md5", - .cra_driver_name =3D "md5-talitos", - .cra_blocksize =3D MD5_HMAC_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_MD5, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA1_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha1", - .cra_driver_name =3D "sha1-talitos", - .cra_blocksize =3D SHA1_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA1, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA224_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha224", - .cra_driver_name =3D "sha224-talitos", - .cra_blocksize =3D SHA224_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA224, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA256_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha256", - .cra_driver_name =3D "sha256-talitos", - .cra_blocksize =3D SHA256_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA256, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA384_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha384", - .cra_driver_name =3D "sha384-talitos", - .cra_blocksize =3D SHA384_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUB | - DESC_HDR_MODE0_MDEUB_SHA384, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA512_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha512", - .cra_driver_name =3D "sha512-talitos", - .cra_blocksize =3D SHA512_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUB | - DESC_HDR_MODE0_MDEUB_SHA512, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D MD5_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(md5)", - .cra_driver_name =3D "hmac-md5-talitos", - .cra_blocksize =3D MD5_HMAC_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_MD5, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA1_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha1)", - .cra_driver_name =3D "hmac-sha1-talitos", - .cra_blocksize =3D SHA1_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA1, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA224_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha224)", - .cra_driver_name =3D "hmac-sha224-talitos", - .cra_blocksize =3D SHA224_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA224, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA256_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha256)", - .cra_driver_name =3D "hmac-sha256-talitos", - .cra_blocksize =3D SHA256_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA256, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA384_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha384)", - .cra_driver_name =3D "hmac-sha384-talitos", - .cra_blocksize =3D SHA384_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUB | - DESC_HDR_MODE0_MDEUB_SHA384, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA512_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha512)", - .cra_driver_name =3D "hmac-sha512-talitos", - .cra_blocksize =3D SHA512_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUB | - DESC_HDR_MODE0_MDEUB_SHA512, - } }; =20 int talitos_init_common(struct talitos_ctx *ctx, @@ -2913,21 +2177,6 @@ static int talitos_cra_init_skcipher(struct crypto_s= kcipher *tfm) return talitos_init_common(ctx, talitos_alg); } =20 -static int talitos_cra_init_ahash(struct crypto_tfm *tfm) -{ - struct crypto_alg *alg =3D tfm->__crt_alg; - struct talitos_crypto_alg *talitos_alg; - struct talitos_ctx *ctx =3D crypto_tfm_ctx(tfm); - - talitos_alg =3D container_of(__crypto_ahash_alg(alg), - struct talitos_crypto_alg, - algt.alg.hash); - - ctx->keylen =3D 0; - - return talitos_init_common(ctx, talitos_alg); -} - void talitos_cra_exit(struct crypto_tfm *tfm) { struct talitos_ctx *ctx =3D crypto_tfm_ctx(tfm); @@ -2993,6 +2242,65 @@ static void talitos_remove(struct platform_device *o= fdev) tasklet_kill(&priv->done_task[1]); } =20 +static void talitos_alg_set_common(struct talitos_private *priv, + struct crypto_alg *alg, u32 custom_priority, + u32 type) +{ + alg->cra_module =3D THIS_MODULE; + if (custom_priority) + alg->cra_priority =3D custom_priority; + else + alg->cra_priority =3D TALITOS_CRA_PRIORITY; + if (has_ftr_sec1(priv) && type !=3D CRYPTO_ALG_TYPE_AHASH) + alg->cra_alignmask =3D 3; + else + alg->cra_alignmask =3D 0; + alg->cra_ctxsize =3D sizeof(struct talitos_ctx); + alg->cra_flags |=3D CRYPTO_ALG_KERN_DRIVER_ONLY; +} + +int talitos_register_common(struct device *dev, + struct talitos_alg_template *template) +{ + struct talitos_private *priv =3D dev_get_drvdata(dev); + struct talitos_crypto_alg *t_alg; + struct crypto_alg *alg; + int ret; + + t_alg =3D devm_kzalloc(dev, sizeof(struct talitos_crypto_alg), + GFP_KERNEL); + if (!t_alg) + return -ENOMEM; + + t_alg->algt =3D *template; + + switch (t_alg->algt.type) { + case CRYPTO_ALG_TYPE_AHASH: + alg =3D &t_alg->algt.alg.hash.halg.base; + talitos_alg_set_common(priv, alg, t_alg->algt.priority, + t_alg->algt.type); + ret =3D crypto_register_ahash(&t_alg->algt.alg.hash); + break; + default: + dev_err(dev, "unknown algorithm type %d\n", t_alg->algt.type); + devm_kfree(dev, t_alg); + return -EINVAL; + } + + if (ret) { + dev_err(dev, "%s alg registration failed\n", + alg->cra_driver_name); + devm_kfree(dev, t_alg); + return 0; + } + + t_alg->dev =3D dev; + + list_add_tail(&t_alg->entry, &priv->alg_list); + + return 0; +} + static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, struct talitos_alg_template *template) @@ -3038,37 +2346,6 @@ static struct talitos_crypto_alg *talitos_alg_alloc(= struct device *dev, return ERR_PTR(-ENOTSUPP); } break; - case CRYPTO_ALG_TYPE_AHASH: - alg =3D &t_alg->algt.alg.hash.halg.base; - alg->cra_init =3D talitos_cra_init_ahash; - alg->cra_exit =3D talitos_cra_exit; - t_alg->algt.alg.hash.init =3D ahash_init; - t_alg->algt.alg.hash.update =3D ahash_update; - t_alg->algt.alg.hash.final =3D ahash_final; - t_alg->algt.alg.hash.finup =3D ahash_finup; - t_alg->algt.alg.hash.digest =3D ahash_digest; - if (!strncmp(alg->cra_name, "hmac", 4)) - t_alg->algt.alg.hash.setkey =3D ahash_setkey; - t_alg->algt.alg.hash.import =3D ahash_import; - t_alg->algt.alg.hash.export =3D ahash_export; - - if (!(priv->features & TALITOS_FTR_HMAC_OK) && - !strncmp(alg->cra_name, "hmac", 4)) { - devm_kfree(dev, t_alg); - return ERR_PTR(-ENOTSUPP); - } - if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) && - (!strcmp(alg->cra_name, "sha224") || - !strcmp(alg->cra_name, "hmac(sha224)"))) { - t_alg->algt.alg.hash.init =3D ahash_init_sha224_swinit; - t_alg->algt.alg.hash.digest =3D - ahash_digest_sha224_swinit; - t_alg->algt.desc_hdr_template =3D - DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA256; - } - break; default: dev_err(dev, "unknown algorithm type %d\n", t_alg->algt.type); devm_kfree(dev, t_alg); @@ -3297,6 +2574,10 @@ static int talitos_probe(struct platform_device *ofd= ev) dev_info(dev, "hwrng\n"); } =20 + err =3D talitos_register_hash(dev); + if (err) + goto err_out; + /* register crypto algorithms the device supports */ for (i =3D 0; i < ARRAY_SIZE(driver_algs); i++) { if (talitos_hw_supports(dev, @@ -3324,12 +2605,6 @@ static int talitos_probe(struct platform_device *ofd= ev) &t_alg->algt.alg.aead); alg =3D &t_alg->algt.alg.aead.base; break; - - case CRYPTO_ALG_TYPE_AHASH: - err =3D crypto_register_ahash( - &t_alg->algt.alg.hash); - alg =3D &t_alg->algt.alg.hash.halg.base; - break; } if (err) { dev_err(dev, "%s alg registration failed\n", diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index 81331914801b..e59c85e3196c 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -599,7 +599,14 @@ int talitos_init_common(struct talitos_ctx *ctx, struct talitos_crypto_alg *talitos_alg); void talitos_cra_exit(struct crypto_tfm *tfm); =20 +int talitos_register_common(struct device *dev, + struct talitos_alg_template *template); + /* Hardware RNG */ =20 int talitos_register_rng(struct device *dev); void talitos_unregister_rng(struct device *dev); + +/* Hash */ + +int talitos_register_hash(struct device *dev); --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9278383983 for ; Tue, 21 Jul 2026 13:59:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642398; cv=none; b=YcMg+ByaCg+w4eTiPWrpFjR06u/vR2/zbPgDW8zl+z1awI275pJqNgPoRVf7MNJacPdAolCFPm1fQ2o2jDNrYk5PX8Ps56wtmV7hYFz7KgebwLkt66i10a2ACoFQrSejIXRD672gXph48VvbQtpW1wKOZhAf67KfHYs/EvRUmSE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642398; c=relaxed/simple; bh=1xWmWVrfjp3cuB7rY86yd3rXzTj+rqi7hhVRUVgv5fY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JmqFYgnyiphQPf5MlVKhge7BKbNDRiSdKBVpw0yG0PSJ2GIiyMYRaspEByc5DuTiZRVeipluQbn4sqCynu8fJZV+gZDwIWU217GeLvoHRxqZxUHQ98m5RiKcpC2IgWm7/Way34cSFzxwFUtCfdVPNO1m2iBCItiWZOiQ6g6ry4g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=HGKLt3qz; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="HGKLt3qz" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 71F221A113D; Tue, 21 Jul 2026 13:59:53 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 469A660368; Tue, 21 Jul 2026 13:59:53 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0321E11BD3B77; Tue, 21 Jul 2026 15:59:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642392; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=LurffLe7EJElTNjys/K0Osrhz8QprbbOGjv/tSQFsAA=; b=HGKLt3qzPyMN3/euJYOitUqH6n3U0t4iySY0/JI6wrdJbK5uaNWl7AaJMgL7VG6KlWNy6M NYA5SAfL3PUOS1zJwE7lrHpA7VzSR+Ihw0uifKcAZbjunJHjDmQ4e9nJkqz9XdUnXWSg9p bBlqp6Muv9j+k829iUYX4ptEXiPXP6qH7hsPfzXihXBB01pG2BpLFcF9rQF1nOtbA1JmDZ ipI2w4lZrWyV6Jvf9H2thZYVTL1hQGr4FS/U45TxSQXRjdXCkzJ14bQqfDYvgQfONiNGYk zObLOvDfxhltg7oid8JVEtx7ve9CoWJbmgsgEOZqNd3FuEQYyI+3rSKp9pa54g== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:34 +0200 Subject: [PATCH v3 07/19] crypto: talitos/skcipher - Move into separate file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-7-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=28462; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=1xWmWVrfjp3cuB7rY86yd3rXzTj+rqi7hhVRUVgv5fY=; b=NlYziNl5VQI0N4gk92DS+gqcOADNz+9w8rWCUqIaVLCJRWwY+1v0w+MFVW5Mvd4tp8Pxv84+0 NnjzBXCA8jOATWUBVjlmpX6CJnEu4EhbxCau/kJrlGgjVlc5UGo0XRV X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Move the skcipher algorithm implementations from talitos.c into a dedicated talitos-skcipher.c file. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/Makefile | 2 +- drivers/crypto/talitos/talitos-skcipher.c | 399 ++++++++++++++++++++++++++= ++++ drivers/crypto/talitos/talitos.c | 377 +-------------------------= -- drivers/crypto/talitos/talitos.h | 1 + 4 files changed, 411 insertions(+), 368 deletions(-) diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile index 40d37f9364ef..d4f19f2f6375 100644 --- a/drivers/crypto/talitos/Makefile +++ b/drivers/crypto/talitos/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D talitos.o =20 -talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o +talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o talitos-skcipher.o diff --git a/drivers/crypto/talitos/talitos-skcipher.c b/drivers/crypto/tal= itos/talitos-skcipher.c new file mode 100644 index 000000000000..f80373610aa4 --- /dev/null +++ b/drivers/crypto/talitos/talitos-skcipher.c @@ -0,0 +1,399 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +/* + * Freescale SEC (talitos) skcipher implementation + * + * Copyright (c) 2006-2011 Freescale Semiconductor, Inc. + */ + +#include +#include + +#include "talitos.h" + +static void common_nonsnoop_unmap(struct device *dev, + struct talitos_edesc *edesc, + struct skcipher_request *areq) +{ + unmap_single_talitos_ptr(dev, &edesc->desc.ptr[5], DMA_FROM_DEVICE); + + talitos_sg_unmap(dev, edesc, areq->src, areq->dst, areq->cryptlen, 0); + unmap_single_talitos_ptr(dev, &edesc->desc.ptr[1], DMA_TO_DEVICE); + + if (edesc->dma_len) + dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len, + DMA_BIDIRECTIONAL); +} + +static void skcipher_done(struct device *dev, + struct talitos_desc *desc, void *context, + int err) +{ + struct skcipher_request *areq =3D context; + struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); + unsigned int ivsize =3D crypto_skcipher_ivsize(cipher); + struct talitos_edesc *edesc; + + edesc =3D container_of(desc, struct talitos_edesc, desc); + + common_nonsnoop_unmap(dev, edesc, areq); + memcpy(areq->iv, ctx->iv, ivsize); + + kfree(edesc); + + skcipher_request_complete(areq, err); +} + +static int common_nonsnoop(struct talitos_edesc *edesc, + struct skcipher_request *areq, + void (*callback) (struct device *dev, + struct talitos_desc *desc, + void *context, int error)) +{ + struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); + struct device *dev =3D ctx->dev; + struct talitos_desc *desc =3D &edesc->desc; + unsigned int cryptlen =3D areq->cryptlen; + unsigned int ivsize =3D crypto_skcipher_ivsize(cipher); + int sg_count, ret; + bool sync_needed =3D false; + struct talitos_private *priv =3D dev_get_drvdata(dev); + bool is_sec1 =3D has_ftr_sec1(priv); + bool is_ctr =3D (desc->hdr & DESC_HDR_SEL0_MASK) =3D=3D DESC_HDR_SEL0_AES= U && + (desc->hdr & DESC_HDR_MODE0_AESU_MASK) =3D=3D DESC_HDR_MODE0_AESU_= CTR; + + /* first DWORD empty */ + + /* cipher iv */ + to_talitos_ptr(&desc->ptr[1], edesc->iv_dma, ivsize, is_sec1); + + /* cipher key */ + to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen, is_sec1); + + sg_count =3D edesc->src_nents ?: 1; + if (is_sec1 && sg_count > 1) + sg_copy_to_buffer(areq->src, sg_count, edesc->buf, + cryptlen); + else + sg_count =3D dma_map_sg(dev, areq->src, sg_count, + (areq->src =3D=3D areq->dst) ? + DMA_BIDIRECTIONAL : DMA_TO_DEVICE); + /* + * cipher in + */ + sg_count =3D talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->p= tr[3], + sg_count, 0, 0, 0, false, is_ctr ? 16 : 1); + if (sg_count > 1) + sync_needed =3D true; + + /* cipher out */ + if (areq->src !=3D areq->dst) { + sg_count =3D edesc->dst_nents ? : 1; + if (!is_sec1 || sg_count =3D=3D 1) + dma_map_sg(dev, areq->dst, sg_count, DMA_FROM_DEVICE); + } + + ret =3D talitos_sg_map(dev, areq->dst, cryptlen, edesc, &desc->ptr[4], + sg_count, 0, (edesc->src_nents + 1)); + if (ret > 1) + sync_needed =3D true; + + /* iv out */ + map_single_talitos_ptr(dev, &desc->ptr[5], ivsize, ctx->iv, + DMA_FROM_DEVICE); + + /* last DWORD empty */ + + if (sync_needed) + dma_sync_single_for_device(dev, edesc->dma_link_tbl, + edesc->dma_len, DMA_BIDIRECTIONAL); + + ret =3D talitos_submit(dev, ctx->ch, desc, callback, areq); + if (ret !=3D -EINPROGRESS) { + common_nonsnoop_unmap(dev, edesc, areq); + kfree(edesc); + } + return ret; +} + +static int skcipher_setkey(struct crypto_skcipher *cipher, + const u8 *key, unsigned int keylen) +{ + struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); + struct device *dev =3D ctx->dev; + + if (ctx->keylen) + dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); + + memcpy(&ctx->key, key, keylen); + ctx->keylen =3D keylen; + + ctx->dma_key =3D dma_map_single(dev, ctx->key, keylen, DMA_TO_DEVICE); + + return 0; +} + +static int skcipher_des_setkey(struct crypto_skcipher *cipher, + const u8 *key, unsigned int keylen) +{ + return verify_skcipher_des_key(cipher, key) ?: + skcipher_setkey(cipher, key, keylen); +} + +static int skcipher_des3_setkey(struct crypto_skcipher *cipher, + const u8 *key, unsigned int keylen) +{ + return verify_skcipher_des3_key(cipher, key) ?: + skcipher_setkey(cipher, key, keylen); +} + +static int skcipher_aes_setkey(struct crypto_skcipher *cipher, + const u8 *key, unsigned int keylen) +{ + if (keylen =3D=3D AES_KEYSIZE_128 || keylen =3D=3D AES_KEYSIZE_192 || + keylen =3D=3D AES_KEYSIZE_256) + return skcipher_setkey(cipher, key, keylen); + + return -EINVAL; +} + +static struct talitos_edesc *skcipher_edesc_alloc(struct skcipher_request * + areq, bool encrypt) +{ + struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); + unsigned int ivsize =3D crypto_skcipher_ivsize(cipher); + + return talitos_edesc_alloc(ctx->dev, areq->src, areq->dst, + areq->iv, 0, areq->cryptlen, 0, ivsize, 0, + areq->base.flags, encrypt); +} + +static int skcipher_encrypt(struct skcipher_request *areq) +{ + struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); + struct talitos_edesc *edesc; + unsigned int blocksize =3D + crypto_tfm_alg_blocksize(crypto_skcipher_tfm(cipher)); + + if (!areq->cryptlen) + return 0; + + if (areq->cryptlen % blocksize) + return -EINVAL; + + /* allocate extended descriptor */ + edesc =3D skcipher_edesc_alloc(areq, true); + if (IS_ERR(edesc)) + return PTR_ERR(edesc); + + /* set encrypt */ + edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; + + return common_nonsnoop(edesc, areq, skcipher_done); +} + +static int skcipher_decrypt(struct skcipher_request *areq) +{ + struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); + struct talitos_edesc *edesc; + unsigned int blocksize =3D + crypto_tfm_alg_blocksize(crypto_skcipher_tfm(cipher)); + + if (!areq->cryptlen) + return 0; + + if (areq->cryptlen % blocksize) + return -EINVAL; + + /* allocate extended descriptor */ + edesc =3D skcipher_edesc_alloc(areq, false); + if (IS_ERR(edesc)) + return PTR_ERR(edesc); + + edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND; + + return common_nonsnoop(edesc, areq, skcipher_done); +} + +static int talitos_cra_init_skcipher(struct crypto_skcipher *tfm) +{ + struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); + struct talitos_crypto_alg *talitos_alg; + struct talitos_ctx *ctx =3D crypto_skcipher_ctx(tfm); + + talitos_alg =3D container_of(alg, struct talitos_crypto_alg, + algt.alg.skcipher); + + return talitos_init_common(ctx, talitos_alg); +} + +static struct talitos_alg_template skcipher_driver_algs[] =3D { + { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, + .alg.skcipher =3D { + .base.cra_name =3D "ecb(aes)", + .base.cra_driver_name =3D "ecb-aes-talitos", + .base.cra_blocksize =3D AES_BLOCK_SIZE, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + .min_keysize =3D AES_MIN_KEY_SIZE, + .max_keysize =3D AES_MAX_KEY_SIZE, + .setkey =3D skcipher_aes_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU, + }, + { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, + .alg.skcipher =3D { + .base.cra_name =3D "cbc(aes)", + .base.cra_driver_name =3D "cbc-aes-talitos", + .base.cra_blocksize =3D AES_BLOCK_SIZE, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + .min_keysize =3D AES_MIN_KEY_SIZE, + .max_keysize =3D AES_MAX_KEY_SIZE, + .ivsize =3D AES_BLOCK_SIZE, + .setkey =3D skcipher_aes_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC, + }, + { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, + .alg.skcipher =3D { + .base.cra_name =3D "ctr(aes)", + .base.cra_driver_name =3D "ctr-aes-talitos", + .base.cra_blocksize =3D 1, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + .min_keysize =3D AES_MIN_KEY_SIZE, + .max_keysize =3D AES_MAX_KEY_SIZE, + .ivsize =3D AES_BLOCK_SIZE, + .setkey =3D skcipher_aes_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_AESU_CTR_NONSNOOP | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CTR, + }, + { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, + .alg.skcipher =3D { + .base.cra_name =3D "ctr(aes)", + .base.cra_driver_name =3D "ctr-aes-talitos", + .base.cra_blocksize =3D 1, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + .min_keysize =3D AES_MIN_KEY_SIZE, + .max_keysize =3D AES_MAX_KEY_SIZE, + .ivsize =3D AES_BLOCK_SIZE, + .setkey =3D skcipher_aes_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CTR, + }, + { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, + .alg.skcipher =3D { + .base.cra_name =3D "ecb(des)", + .base.cra_driver_name =3D "ecb-des-talitos", + .base.cra_blocksize =3D DES_BLOCK_SIZE, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + .min_keysize =3D DES_KEY_SIZE, + .max_keysize =3D DES_KEY_SIZE, + .setkey =3D skcipher_des_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU, + }, + { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, + .alg.skcipher =3D { + .base.cra_name =3D "cbc(des)", + .base.cra_driver_name =3D "cbc-des-talitos", + .base.cra_blocksize =3D DES_BLOCK_SIZE, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + .min_keysize =3D DES_KEY_SIZE, + .max_keysize =3D DES_KEY_SIZE, + .ivsize =3D DES_BLOCK_SIZE, + .setkey =3D skcipher_des_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC, + }, + { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, + .alg.skcipher =3D { + .base.cra_name =3D "ecb(des3_ede)", + .base.cra_driver_name =3D "ecb-3des-talitos", + .base.cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + .min_keysize =3D DES3_EDE_KEY_SIZE, + .max_keysize =3D DES3_EDE_KEY_SIZE, + .setkey =3D skcipher_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_3DES, + }, + { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, + .alg.skcipher =3D { + .base.cra_name =3D "cbc(des3_ede)", + .base.cra_driver_name =3D "cbc-3des-talitos", + .base.cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .base.cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + .min_keysize =3D DES3_EDE_KEY_SIZE, + .max_keysize =3D DES3_EDE_KEY_SIZE, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .setkey =3D skcipher_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES, + }, +}; + +int talitos_register_skcipher(struct device *dev) +{ + struct talitos_private *priv =3D dev_get_drvdata(dev); + struct skcipher_alg *skcipher_alg; + struct crypto_alg *alg; + size_t i; + int ret; + + for (i =3D 0; i < ARRAY_SIZE(skcipher_driver_algs); i++) { + if (!talitos_hw_supports( + dev, skcipher_driver_algs[i].desc_hdr_template)) + continue; + + skcipher_alg =3D &skcipher_driver_algs[i].alg.skcipher; + alg =3D &skcipher_alg->base; + + alg->cra_exit =3D talitos_cra_exit; + if (has_ftr_sec1(priv)) + alg->cra_alignmask =3D 3; + + skcipher_alg->init =3D talitos_cra_init_skcipher; + skcipher_alg->setkey =3D skcipher_alg->setkey ?: skcipher_setkey; + skcipher_alg->encrypt =3D skcipher_encrypt; + skcipher_alg->decrypt =3D skcipher_decrypt; + + if (!strcmp(alg->cra_name, "ctr(aes)") && !has_ftr_sec1(priv) && + DESC_TYPE(skcipher_driver_algs[i].desc_hdr_template) !=3D + DESC_TYPE(DESC_HDR_TYPE_AESU_CTR_NONSNOOP)) { + continue; + } + + ret =3D talitos_register_common(dev, &skcipher_driver_algs[i]); + if (ret) + return ret; + } + + return 0; +} diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 2d5688b1c81e..4b77253e04fa 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -1337,215 +1337,6 @@ static int aead_decrypt(struct aead_request *req) return ipsec_esp(edesc, req, false, ipsec_esp_decrypt_swauth_done); } =20 -static int skcipher_setkey(struct crypto_skcipher *cipher, - const u8 *key, unsigned int keylen) -{ - struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); - struct device *dev =3D ctx->dev; - - if (ctx->keylen) - dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); - - memcpy(&ctx->key, key, keylen); - ctx->keylen =3D keylen; - - ctx->dma_key =3D dma_map_single(dev, ctx->key, keylen, DMA_TO_DEVICE); - - return 0; -} - -static int skcipher_des_setkey(struct crypto_skcipher *cipher, - const u8 *key, unsigned int keylen) -{ - return verify_skcipher_des_key(cipher, key) ?: - skcipher_setkey(cipher, key, keylen); -} - -static int skcipher_des3_setkey(struct crypto_skcipher *cipher, - const u8 *key, unsigned int keylen) -{ - return verify_skcipher_des3_key(cipher, key) ?: - skcipher_setkey(cipher, key, keylen); -} - -static int skcipher_aes_setkey(struct crypto_skcipher *cipher, - const u8 *key, unsigned int keylen) -{ - if (keylen =3D=3D AES_KEYSIZE_128 || keylen =3D=3D AES_KEYSIZE_192 || - keylen =3D=3D AES_KEYSIZE_256) - return skcipher_setkey(cipher, key, keylen); - - return -EINVAL; -} - -static void common_nonsnoop_unmap(struct device *dev, - struct talitos_edesc *edesc, - struct skcipher_request *areq) -{ - unmap_single_talitos_ptr(dev, &edesc->desc.ptr[5], DMA_FROM_DEVICE); - - talitos_sg_unmap(dev, edesc, areq->src, areq->dst, areq->cryptlen, 0); - unmap_single_talitos_ptr(dev, &edesc->desc.ptr[1], DMA_TO_DEVICE); - - if (edesc->dma_len) - dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len, - DMA_BIDIRECTIONAL); -} - -static void skcipher_done(struct device *dev, - struct talitos_desc *desc, void *context, - int err) -{ - struct skcipher_request *areq =3D context; - struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); - unsigned int ivsize =3D crypto_skcipher_ivsize(cipher); - struct talitos_edesc *edesc; - - edesc =3D container_of(desc, struct talitos_edesc, desc); - - common_nonsnoop_unmap(dev, edesc, areq); - memcpy(areq->iv, ctx->iv, ivsize); - - kfree(edesc); - - skcipher_request_complete(areq, err); -} - -static int common_nonsnoop(struct talitos_edesc *edesc, - struct skcipher_request *areq, - void (*callback) (struct device *dev, - struct talitos_desc *desc, - void *context, int error)) -{ - struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); - struct device *dev =3D ctx->dev; - struct talitos_desc *desc =3D &edesc->desc; - unsigned int cryptlen =3D areq->cryptlen; - unsigned int ivsize =3D crypto_skcipher_ivsize(cipher); - int sg_count, ret; - bool sync_needed =3D false; - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); - bool is_ctr =3D (desc->hdr & DESC_HDR_SEL0_MASK) =3D=3D DESC_HDR_SEL0_AES= U && - (desc->hdr & DESC_HDR_MODE0_AESU_MASK) =3D=3D DESC_HDR_MODE0_AESU_= CTR; - - /* first DWORD empty */ - - /* cipher iv */ - to_talitos_ptr(&desc->ptr[1], edesc->iv_dma, ivsize, is_sec1); - - /* cipher key */ - to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen, is_sec1); - - sg_count =3D edesc->src_nents ?: 1; - if (is_sec1 && sg_count > 1) - sg_copy_to_buffer(areq->src, sg_count, edesc->buf, - cryptlen); - else - sg_count =3D dma_map_sg(dev, areq->src, sg_count, - (areq->src =3D=3D areq->dst) ? - DMA_BIDIRECTIONAL : DMA_TO_DEVICE); - /* - * cipher in - */ - sg_count =3D talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->p= tr[3], - sg_count, 0, 0, 0, false, is_ctr ? 16 : 1); - if (sg_count > 1) - sync_needed =3D true; - - /* cipher out */ - if (areq->src !=3D areq->dst) { - sg_count =3D edesc->dst_nents ? : 1; - if (!is_sec1 || sg_count =3D=3D 1) - dma_map_sg(dev, areq->dst, sg_count, DMA_FROM_DEVICE); - } - - ret =3D talitos_sg_map(dev, areq->dst, cryptlen, edesc, &desc->ptr[4], - sg_count, 0, (edesc->src_nents + 1)); - if (ret > 1) - sync_needed =3D true; - - /* iv out */ - map_single_talitos_ptr(dev, &desc->ptr[5], ivsize, ctx->iv, - DMA_FROM_DEVICE); - - /* last DWORD empty */ - - if (sync_needed) - dma_sync_single_for_device(dev, edesc->dma_link_tbl, - edesc->dma_len, DMA_BIDIRECTIONAL); - - ret =3D talitos_submit(dev, ctx->ch, desc, callback, areq); - if (ret !=3D -EINPROGRESS) { - common_nonsnoop_unmap(dev, edesc, areq); - kfree(edesc); - } - return ret; -} - -static struct talitos_edesc *skcipher_edesc_alloc(struct skcipher_request * - areq, bool encrypt) -{ - struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); - unsigned int ivsize =3D crypto_skcipher_ivsize(cipher); - - return talitos_edesc_alloc(ctx->dev, areq->src, areq->dst, - areq->iv, 0, areq->cryptlen, 0, ivsize, 0, - areq->base.flags, encrypt); -} - -static int skcipher_encrypt(struct skcipher_request *areq) -{ - struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); - struct talitos_edesc *edesc; - unsigned int blocksize =3D - crypto_tfm_alg_blocksize(crypto_skcipher_tfm(cipher)); - - if (!areq->cryptlen) - return 0; - - if (areq->cryptlen % blocksize) - return -EINVAL; - - /* allocate extended descriptor */ - edesc =3D skcipher_edesc_alloc(areq, true); - if (IS_ERR(edesc)) - return PTR_ERR(edesc); - - /* set encrypt */ - edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; - - return common_nonsnoop(edesc, areq, skcipher_done); -} - -static int skcipher_decrypt(struct skcipher_request *areq) -{ - struct crypto_skcipher *cipher =3D crypto_skcipher_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_skcipher_ctx(cipher); - struct talitos_edesc *edesc; - unsigned int blocksize =3D - crypto_tfm_alg_blocksize(crypto_skcipher_tfm(cipher)); - - if (!areq->cryptlen) - return 0; - - if (areq->cryptlen % blocksize) - return -EINVAL; - - /* allocate extended descriptor */ - edesc =3D skcipher_edesc_alloc(areq, false); - if (IS_ERR(edesc)) - return PTR_ERR(edesc); - - edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND; - - return common_nonsnoop(edesc, areq, skcipher_done); -} - static struct talitos_alg_template driver_algs[] =3D { /* AEAD algorithms. These use a single-pass ipsec_esp descriptor */ { .type =3D CRYPTO_ALG_TYPE_AEAD, @@ -2004,131 +1795,6 @@ static struct talitos_alg_template driver_algs[] = =3D { DESC_HDR_MODE1_MDEU_PAD | DESC_HDR_MODE1_MDEU_MD5_HMAC, }, - /* SKCIPHER algorithms. */ - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ecb(aes)", - .base.cra_driver_name =3D "ecb-aes-talitos", - .base.cra_blocksize =3D AES_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D AES_MIN_KEY_SIZE, - .max_keysize =3D AES_MAX_KEY_SIZE, - .setkey =3D skcipher_aes_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "cbc(aes)", - .base.cra_driver_name =3D "cbc-aes-talitos", - .base.cra_blocksize =3D AES_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D AES_MIN_KEY_SIZE, - .max_keysize =3D AES_MAX_KEY_SIZE, - .ivsize =3D AES_BLOCK_SIZE, - .setkey =3D skcipher_aes_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ctr(aes)", - .base.cra_driver_name =3D "ctr-aes-talitos", - .base.cra_blocksize =3D 1, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D AES_MIN_KEY_SIZE, - .max_keysize =3D AES_MAX_KEY_SIZE, - .ivsize =3D AES_BLOCK_SIZE, - .setkey =3D skcipher_aes_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_AESU_CTR_NONSNOOP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CTR, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ctr(aes)", - .base.cra_driver_name =3D "ctr-aes-talitos", - .base.cra_blocksize =3D 1, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D AES_MIN_KEY_SIZE, - .max_keysize =3D AES_MAX_KEY_SIZE, - .ivsize =3D AES_BLOCK_SIZE, - .setkey =3D skcipher_aes_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CTR, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ecb(des)", - .base.cra_driver_name =3D "ecb-des-talitos", - .base.cra_blocksize =3D DES_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D DES_KEY_SIZE, - .max_keysize =3D DES_KEY_SIZE, - .setkey =3D skcipher_des_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "cbc(des)", - .base.cra_driver_name =3D "cbc-des-talitos", - .base.cra_blocksize =3D DES_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D DES_KEY_SIZE, - .max_keysize =3D DES_KEY_SIZE, - .ivsize =3D DES_BLOCK_SIZE, - .setkey =3D skcipher_des_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ecb(des3_ede)", - .base.cra_driver_name =3D "ecb-3des-talitos", - .base.cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D DES3_EDE_KEY_SIZE, - .max_keysize =3D DES3_EDE_KEY_SIZE, - .setkey =3D skcipher_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_3DES, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "cbc(des3_ede)", - .base.cra_driver_name =3D "cbc-3des-talitos", - .base.cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D DES3_EDE_KEY_SIZE, - .max_keysize =3D DES3_EDE_KEY_SIZE, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .setkey =3D skcipher_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES, - }, }; =20 int talitos_init_common(struct talitos_ctx *ctx, @@ -2165,18 +1831,6 @@ static int talitos_cra_init_aead(struct crypto_aead = *tfm) return talitos_init_common(ctx, talitos_alg); } =20 -static int talitos_cra_init_skcipher(struct crypto_skcipher *tfm) -{ - struct skcipher_alg *alg =3D crypto_skcipher_alg(tfm); - struct talitos_crypto_alg *talitos_alg; - struct talitos_ctx *ctx =3D crypto_skcipher_ctx(tfm); - - talitos_alg =3D container_of(alg, struct talitos_crypto_alg, - algt.alg.skcipher); - - return talitos_init_common(ctx, talitos_alg); -} - void talitos_cra_exit(struct crypto_tfm *tfm) { struct talitos_ctx *ctx =3D crypto_tfm_ctx(tfm); @@ -2281,6 +1935,12 @@ int talitos_register_common(struct device *dev, t_alg->algt.type); ret =3D crypto_register_ahash(&t_alg->algt.alg.hash); break; + case CRYPTO_ALG_TYPE_SKCIPHER: + alg =3D &t_alg->algt.alg.skcipher.base; + talitos_alg_set_common(priv, alg, t_alg->algt.priority, + t_alg->algt.type); + ret =3D crypto_register_skcipher(&t_alg->algt.alg.skcipher); + break; default: dev_err(dev, "unknown algorithm type %d\n", t_alg->algt.type); devm_kfree(dev, t_alg); @@ -2317,21 +1977,6 @@ static struct talitos_crypto_alg *talitos_alg_alloc(= struct device *dev, t_alg->algt =3D *template; =20 switch (t_alg->algt.type) { - case CRYPTO_ALG_TYPE_SKCIPHER: - alg =3D &t_alg->algt.alg.skcipher.base; - alg->cra_exit =3D talitos_cra_exit; - t_alg->algt.alg.skcipher.init =3D talitos_cra_init_skcipher; - t_alg->algt.alg.skcipher.setkey =3D - t_alg->algt.alg.skcipher.setkey ?: skcipher_setkey; - t_alg->algt.alg.skcipher.encrypt =3D skcipher_encrypt; - t_alg->algt.alg.skcipher.decrypt =3D skcipher_decrypt; - if (!strcmp(alg->cra_name, "ctr(aes)") && !has_ftr_sec1(priv) && - DESC_TYPE(t_alg->algt.desc_hdr_template) !=3D - DESC_TYPE(DESC_HDR_TYPE_AESU_CTR_NONSNOOP)) { - devm_kfree(dev, t_alg); - return ERR_PTR(-ENOTSUPP); - } - break; case CRYPTO_ALG_TYPE_AEAD: alg =3D &t_alg->algt.alg.aead.base; alg->cra_exit =3D talitos_cra_exit; @@ -2578,6 +2223,10 @@ static int talitos_probe(struct platform_device *ofd= ev) if (err) goto err_out; =20 + err =3D talitos_register_skcipher(dev); + if (err) + goto err_out; + /* register crypto algorithms the device supports */ for (i =3D 0; i < ARRAY_SIZE(driver_algs); i++) { if (talitos_hw_supports(dev, @@ -2594,12 +2243,6 @@ static int talitos_probe(struct platform_device *ofd= ev) } =20 switch (t_alg->algt.type) { - case CRYPTO_ALG_TYPE_SKCIPHER: - err =3D crypto_register_skcipher( - &t_alg->algt.alg.skcipher); - alg =3D &t_alg->algt.alg.skcipher.base; - break; - case CRYPTO_ALG_TYPE_AEAD: err =3D crypto_register_aead( &t_alg->algt.alg.aead); diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index e59c85e3196c..4a803ad6349d 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -610,3 +610,4 @@ void talitos_unregister_rng(struct device *dev); /* Hash */ =20 int talitos_register_hash(struct device *dev); +int talitos_register_skcipher(struct device *dev); --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15A8237A85F; Tue, 21 Jul 2026 13:59:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642400; cv=none; b=N0ByqJbC9A5T8cqnVffnrsOAwYIQBgejTXHxJ89geMZI6rN7P9dZeaXXXDnOYCrLryn2cjdTukbANzcyR9RQSm5fkpOVykRZaRLtvlqifyox2ft5knA1RMRa0+CuIx+YW2UP8q7fr9wnecHhGPZ6Tzm1kNgBYlHloLqPVe9q1sw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642400; c=relaxed/simple; bh=om44rjoW3WKTIxLo9T/AtgEDb0m2VsbjqjblicMr9tg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AqC5WQD4NVXWtq5ngiuaDPnbFu1jCLeCq0CXQInU4Sy5S3dm6eWnPskTDdDUOrzvVOkivH1ZN7k8mKFx8IvMTnJbrTGTYxfq3fmxP9aPapSOP2+T8HyMbZasmdpoFRF8pTJPkTdCY0WpJ4Y3b3O0p188ER4HVVfDwA42fbiK8Ac= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=qZzkeLlv; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="qZzkeLlv" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 8ABE94E40EA7; Tue, 21 Jul 2026 13:59:54 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 5725660368; Tue, 21 Jul 2026 13:59:54 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 07E9E11BD3B79; Tue, 21 Jul 2026 15:59:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642393; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=4Cgj0UjR306IqqJYDAwnanyoYHuasF+pPH2uq0wyVFE=; b=qZzkeLlvpMcT0FC3U7SsdKcb2WO7eL2HFJRpAo1gpZ9IxddNviZutMRPTzyE/vCjNAHPTb qd3MhQKsZN/C5PWL3sMkyH9toqV1tnpVK/yzqusMVehRf9hF+kuLoP5FZlJj9olPkSk9iG fGTjR7fc9DiMgxcpRB0qgXRIWx64CIGzhsXRU+Fvo3cyGjfDOtArZMcIo//h37+jGjnCHl QQHrC+YtCoEi5OFCCS8afMFQuyOYwDysQG4REY26HRko+/B+StIeiE8cwmnv0IuiF2cOKv XlAMQAZ2gvbQe90E/gMTeG6+bjcBzgmJSgxeuRY8hxNJsIcfdtomrx/WDzaNhg== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:35 +0200 Subject: [PATCH v3 08/19] crypto: talitos/aead - Move into separate file Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-8-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=63422; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=om44rjoW3WKTIxLo9T/AtgEDb0m2VsbjqjblicMr9tg=; b=Ykwy/DzIoLnOkueYsc4zYEi7Y954unKFduhLtbuQaUe6xWyzi0o1bu8YaR9ZSjdjQV9YAOy5/ pfkLJEQ5nJ4CfegiJF2czixg18s//92gwxq99XepCj+lFHvgz/WEg8w X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Move the AEAD algorithm implementations from talitos.c into a dedicated talitos-aead.c file. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/Makefile | 2 +- drivers/crypto/talitos/talitos-aead.c | 897 ++++++++++++++++++++++++++++++= ++ drivers/crypto/talitos/talitos.c | 947 +-----------------------------= ---- drivers/crypto/talitos/talitos.h | 3 + 4 files changed, 910 insertions(+), 939 deletions(-) diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile index d4f19f2f6375..9e80bb094507 100644 --- a/drivers/crypto/talitos/Makefile +++ b/drivers/crypto/talitos/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D talitos.o =20 -talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o talitos-skcipher.o +talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o talitos-skcipher.o t= alitos-aead.o diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c new file mode 100644 index 000000000000..ced314a645db --- /dev/null +++ b/drivers/crypto/talitos/talitos-aead.c @@ -0,0 +1,897 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include +#include +#include + +#include "talitos.h" + +/* + * Defines a priority for doing AEAD with descriptors type + * HMAC_SNOOP_NO_AFEA (HSNA) instead of type IPSEC_ESP + */ +#define TALITOS_CRA_PRIORITY_AEAD_HSNA (TALITOS_CRA_PRIORITY - 1) + +static int aead_setkey(struct crypto_aead *authenc, + const u8 *key, unsigned int keylen) +{ + struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); + struct device *dev =3D ctx->dev; + struct crypto_authenc_keys keys; + + if (crypto_authenc_extractkeys(&keys, key, keylen) !=3D 0) + goto badkey; + + if (keys.authkeylen + keys.enckeylen > TALITOS_MAX_KEY_SIZE) + goto badkey; + + if (ctx->keylen) + dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); + + memcpy(ctx->key, keys.authkey, keys.authkeylen); + memcpy(&ctx->key[keys.authkeylen], keys.enckey, keys.enckeylen); + + ctx->keylen =3D keys.authkeylen + keys.enckeylen; + ctx->enckeylen =3D keys.enckeylen; + ctx->authkeylen =3D keys.authkeylen; + ctx->dma_key =3D dma_map_single(dev, ctx->key, ctx->keylen, + DMA_TO_DEVICE); + + memzero_explicit(&keys, sizeof(keys)); + return 0; + +badkey: + memzero_explicit(&keys, sizeof(keys)); + return -EINVAL; +} + +static int aead_des3_setkey(struct crypto_aead *authenc, + const u8 *key, unsigned int keylen) +{ + struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); + struct device *dev =3D ctx->dev; + struct crypto_authenc_keys keys; + int err; + + err =3D crypto_authenc_extractkeys(&keys, key, keylen); + if (unlikely(err)) + goto out; + + err =3D -EINVAL; + if (keys.authkeylen + keys.enckeylen > TALITOS_MAX_KEY_SIZE) + goto out; + + err =3D verify_aead_des3_key(authenc, keys.enckey, keys.enckeylen); + if (err) + goto out; + + if (ctx->keylen) + dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); + + memcpy(ctx->key, keys.authkey, keys.authkeylen); + memcpy(&ctx->key[keys.authkeylen], keys.enckey, keys.enckeylen); + + ctx->keylen =3D keys.authkeylen + keys.enckeylen; + ctx->enckeylen =3D keys.enckeylen; + ctx->authkeylen =3D keys.authkeylen; + ctx->dma_key =3D dma_map_single(dev, ctx->key, ctx->keylen, + DMA_TO_DEVICE); + +out: + memzero_explicit(&keys, sizeof(keys)); + return err; +} + +static void ipsec_esp_unmap(struct device *dev, + struct talitos_edesc *edesc, + struct aead_request *areq, bool encrypt) +{ + struct crypto_aead *aead =3D crypto_aead_reqtfm(areq); + struct talitos_ctx *ctx =3D crypto_aead_ctx(aead); + unsigned int ivsize =3D crypto_aead_ivsize(aead); + unsigned int authsize =3D crypto_aead_authsize(aead); + unsigned int cryptlen =3D areq->cryptlen - (encrypt ? 0 : authsize); + bool is_ipsec_esp =3D edesc->desc.hdr & DESC_HDR_TYPE_IPSEC_ESP; + struct talitos_ptr *civ_ptr =3D &edesc->desc.ptr[is_ipsec_esp ? 2 : 3]; + + if (is_ipsec_esp) + unmap_single_talitos_ptr(dev, &edesc->desc.ptr[6], + DMA_FROM_DEVICE); + unmap_single_talitos_ptr(dev, civ_ptr, DMA_TO_DEVICE); + + talitos_sg_unmap(dev, edesc, areq->src, areq->dst, + cryptlen + authsize, areq->assoclen); + + if (edesc->dma_len) + dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len, + DMA_BIDIRECTIONAL); + + if (!is_ipsec_esp) { + unsigned int dst_nents =3D edesc->dst_nents ? : 1; + + sg_pcopy_to_buffer(areq->dst, dst_nents, ctx->iv, ivsize, + areq->assoclen + cryptlen - ivsize); + } +} + +/* + * ipsec_esp descriptor callbacks + */ +static void ipsec_esp_encrypt_done(struct device *dev, + struct talitos_desc *desc, void *context, + int err) +{ + struct aead_request *areq =3D context; + struct crypto_aead *authenc =3D crypto_aead_reqtfm(areq); + unsigned int ivsize =3D crypto_aead_ivsize(authenc); + struct talitos_edesc *edesc; + + edesc =3D container_of(desc, struct talitos_edesc, desc); + + ipsec_esp_unmap(dev, edesc, areq, true); + + dma_unmap_single(dev, edesc->iv_dma, ivsize, DMA_TO_DEVICE); + + kfree(edesc); + + aead_request_complete(areq, err); +} + +static void ipsec_esp_decrypt_swauth_done(struct device *dev, + struct talitos_desc *desc, + void *context, int err) +{ + struct aead_request *req =3D context; + struct crypto_aead *authenc =3D crypto_aead_reqtfm(req); + unsigned int authsize =3D crypto_aead_authsize(authenc); + struct talitos_edesc *edesc; + char *oicv, *icv; + + edesc =3D container_of(desc, struct talitos_edesc, desc); + + ipsec_esp_unmap(dev, edesc, req, false); + + if (!err) { + /* auth check */ + oicv =3D edesc->buf + edesc->dma_len; + icv =3D oicv - authsize; + + err =3D crypto_memneq(oicv, icv, authsize) ? -EBADMSG : 0; + } + + kfree(edesc); + + aead_request_complete(req, err); +} + +static void ipsec_esp_decrypt_hwauth_done(struct device *dev, + struct talitos_desc *desc, + void *context, int err) +{ + struct aead_request *req =3D context; + struct talitos_edesc *edesc; + + edesc =3D container_of(desc, struct talitos_edesc, desc); + + ipsec_esp_unmap(dev, edesc, req, false); + + /* check ICV auth status */ + if (!err && ((desc->hdr_lo & DESC_HDR_LO_ICCR1_MASK) !=3D + DESC_HDR_LO_ICCR1_PASS)) + err =3D -EBADMSG; + + kfree(edesc); + + aead_request_complete(req, err); +} + +/* + * fill in and submit ipsec_esp descriptor + */ +static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *are= q, + bool encrypt, + void (*callback)(struct device *dev, + struct talitos_desc *desc, + void *context, int error)) +{ + struct crypto_aead *aead =3D crypto_aead_reqtfm(areq); + unsigned int authsize =3D crypto_aead_authsize(aead); + struct talitos_ctx *ctx =3D crypto_aead_ctx(aead); + struct device *dev =3D ctx->dev; + struct talitos_desc *desc =3D &edesc->desc; + unsigned int cryptlen =3D areq->cryptlen - (encrypt ? 0 : authsize); + unsigned int ivsize =3D crypto_aead_ivsize(aead); + int tbl_off =3D 0; + int sg_count, ret; + int elen =3D 0; + bool sync_needed =3D false; + struct talitos_private *priv =3D dev_get_drvdata(dev); + bool is_sec1 =3D has_ftr_sec1(priv); + bool is_ipsec_esp =3D desc->hdr & DESC_HDR_TYPE_IPSEC_ESP; + struct talitos_ptr *civ_ptr =3D &desc->ptr[is_ipsec_esp ? 2 : 3]; + struct talitos_ptr *ckey_ptr =3D &desc->ptr[is_ipsec_esp ? 3 : 2]; + dma_addr_t dma_icv =3D edesc->dma_link_tbl + edesc->dma_len - authsize; + + /* hmac key */ + to_talitos_ptr(&desc->ptr[0], ctx->dma_key, ctx->authkeylen, is_sec1); + + sg_count =3D edesc->src_nents ?: 1; + if (is_sec1 && sg_count > 1) + sg_copy_to_buffer(areq->src, sg_count, edesc->buf, + areq->assoclen + cryptlen); + else + sg_count =3D dma_map_sg(dev, areq->src, sg_count, + (areq->src =3D=3D areq->dst) ? + DMA_BIDIRECTIONAL : DMA_TO_DEVICE); + + /* hmac data */ + ret =3D talitos_sg_map(dev, areq->src, areq->assoclen, edesc, + &desc->ptr[1], sg_count, 0, tbl_off); + + if (ret > 1) { + tbl_off +=3D ret; + sync_needed =3D true; + } + + /* cipher iv */ + to_talitos_ptr(civ_ptr, edesc->iv_dma, ivsize, is_sec1); + + /* cipher key */ + to_talitos_ptr(ckey_ptr, ctx->dma_key + ctx->authkeylen, + ctx->enckeylen, is_sec1); + + /* + * cipher in + * map and adjust cipher len to aead request cryptlen. + * extent is bytes of HMAC postpended to ciphertext, + * typically 12 for ipsec + */ + if (is_ipsec_esp && (desc->hdr & DESC_HDR_MODE1_MDEU_CICV)) + elen =3D authsize; + + ret =3D talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->ptr[4], + sg_count, areq->assoclen, tbl_off, elen, + false, 1); + + if (ret > 1) { + tbl_off +=3D ret; + sync_needed =3D true; + } + + /* cipher out */ + if (areq->src !=3D areq->dst) { + sg_count =3D edesc->dst_nents ? : 1; + if (!is_sec1 || sg_count =3D=3D 1) + dma_map_sg(dev, areq->dst, sg_count, DMA_FROM_DEVICE); + } + + if (is_ipsec_esp && encrypt) + elen =3D authsize; + else + elen =3D 0; + ret =3D talitos_sg_map_ext(dev, areq->dst, cryptlen, edesc, &desc->ptr[5], + sg_count, areq->assoclen, tbl_off, elen, + is_ipsec_esp && !encrypt, 1); + tbl_off +=3D ret; + + if (!encrypt && is_ipsec_esp) { + struct talitos_ptr *tbl_ptr =3D &edesc->link_tbl[tbl_off]; + + /* Add an entry to the link table for ICV data */ + to_talitos_ptr_ext_set(tbl_ptr - 1, 0, is_sec1); + to_talitos_ptr_ext_set(tbl_ptr, DESC_PTR_LNKTBL_RET, is_sec1); + + /* icv data follows link tables */ + to_talitos_ptr(tbl_ptr, dma_icv, authsize, is_sec1); + to_talitos_ptr_ext_or(&desc->ptr[5], authsize, is_sec1); + sync_needed =3D true; + } else if (!encrypt) { + to_talitos_ptr(&desc->ptr[6], dma_icv, authsize, is_sec1); + sync_needed =3D true; + } else if (!is_ipsec_esp) { + talitos_sg_map(dev, areq->dst, authsize, edesc, &desc->ptr[6], + sg_count, areq->assoclen + cryptlen, tbl_off); + } + + /* iv out */ + if (is_ipsec_esp) + map_single_talitos_ptr(dev, &desc->ptr[6], ivsize, ctx->iv, + DMA_FROM_DEVICE); + + if (sync_needed) + dma_sync_single_for_device(dev, edesc->dma_link_tbl, + edesc->dma_len, + DMA_BIDIRECTIONAL); + + ret =3D talitos_submit(dev, ctx->ch, desc, callback, areq); + if (ret !=3D -EINPROGRESS) { + ipsec_esp_unmap(dev, edesc, areq, encrypt); + kfree(edesc); + } + return ret; +} + +static struct talitos_edesc *aead_edesc_alloc(struct aead_request *areq, u= 8 *iv, + int icv_stashing, bool encrypt) +{ + struct crypto_aead *authenc =3D crypto_aead_reqtfm(areq); + unsigned int authsize =3D crypto_aead_authsize(authenc); + struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); + unsigned int ivsize =3D crypto_aead_ivsize(authenc); + unsigned int cryptlen =3D areq->cryptlen - (encrypt ? 0 : authsize); + + return talitos_edesc_alloc(ctx->dev, areq->src, areq->dst, + iv, areq->assoclen, cryptlen, + authsize, ivsize, icv_stashing, + areq->base.flags, encrypt); +} + +static int aead_encrypt(struct aead_request *req) +{ + struct crypto_aead *authenc =3D crypto_aead_reqtfm(req); + struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); + struct talitos_edesc *edesc; + + /* allocate extended descriptor */ + edesc =3D aead_edesc_alloc(req, req->iv, 0, true); + if (IS_ERR(edesc)) + return PTR_ERR(edesc); + + /* set encrypt */ + edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; + + return ipsec_esp(edesc, req, true, ipsec_esp_encrypt_done); +} + +static int aead_decrypt(struct aead_request *req) +{ + struct crypto_aead *authenc =3D crypto_aead_reqtfm(req); + unsigned int authsize =3D crypto_aead_authsize(authenc); + struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); + struct talitos_private *priv =3D dev_get_drvdata(ctx->dev); + struct talitos_edesc *edesc; + void *icvdata; + + /* allocate extended descriptor */ + edesc =3D aead_edesc_alloc(req, req->iv, 1, false); + if (IS_ERR(edesc)) + return PTR_ERR(edesc); + + if ((edesc->desc.hdr & DESC_HDR_TYPE_IPSEC_ESP) && + (priv->features & TALITOS_FTR_HW_AUTH_CHECK) && + ((!edesc->src_nents && !edesc->dst_nents) || + priv->features & TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT)) { + + /* decrypt and check the ICV */ + edesc->desc.hdr =3D ctx->desc_hdr_template | + DESC_HDR_DIR_INBOUND | + DESC_HDR_MODE1_MDEU_CICV; + + /* reset integrity check result bits */ + + return ipsec_esp(edesc, req, false, + ipsec_esp_decrypt_hwauth_done); + } + + /* Have to check the ICV with software */ + edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND; + + /* stash incoming ICV for later cmp with ICV generated by the h/w */ + icvdata =3D edesc->buf + edesc->dma_len; + + sg_pcopy_to_buffer(req->src, edesc->src_nents ? : 1, icvdata, authsize, + req->assoclen + req->cryptlen - authsize); + + return ipsec_esp(edesc, req, false, ipsec_esp_decrypt_swauth_done); +} + +static int talitos_cra_init_aead(struct crypto_aead *tfm) +{ + struct aead_alg *alg =3D crypto_aead_alg(tfm); + struct talitos_crypto_alg *talitos_alg; + struct talitos_ctx *ctx =3D crypto_aead_ctx(tfm); + + talitos_alg =3D container_of(alg, struct talitos_crypto_alg, + algt.alg.aead); + + return talitos_init_common(ctx, talitos_alg); +} + +static struct talitos_alg_template aead_driver_algs[] =3D { + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha1),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-sha1-" + "cbc-aes-talitos", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D SHA1_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA1_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha1),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-sha1-" + "cbc-aes-talitos-hsna", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D SHA1_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA1_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha1)," + "cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-sha1-" + "cbc-3des-talitos", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D SHA1_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA1_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha1)," + "cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-sha1-" + "cbc-3des-talitos-hsna", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D SHA1_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA1_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha224),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-sha224-" + "cbc-aes-talitos", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D SHA224_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA224_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha224),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-sha224-" + "cbc-aes-talitos-hsna", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D SHA224_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA224_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha224)," + "cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-sha224-" + "cbc-3des-talitos", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D SHA224_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA224_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha224)," + "cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-sha224-" + "cbc-3des-talitos-hsna", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D SHA224_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA224_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha256),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-sha256-" + "cbc-aes-talitos", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D SHA256_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA256_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha256),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-sha256-" + "cbc-aes-talitos-hsna", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D SHA256_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA256_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha256)," + "cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-sha256-" + "cbc-3des-talitos", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D SHA256_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA256_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha256)," + "cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-sha256-" + "cbc-3des-talitos-hsna", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D SHA256_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA256_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha384),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-sha384-" + "cbc-aes-talitos", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D SHA384_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUB | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEUB_SHA384_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha384)," + "cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-sha384-" + "cbc-3des-talitos", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D SHA384_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUB | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEUB_SHA384_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha512),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-sha512-" + "cbc-aes-talitos", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D SHA512_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUB | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEUB_SHA512_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(sha512)," + "cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-sha512-" + "cbc-3des-talitos", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D SHA512_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUB | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEUB_SHA512_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(md5),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-md5-" + "cbc-aes-talitos", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D MD5_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_MD5_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(md5),cbc(aes))", + .cra_driver_name =3D "authenc-hmac-md5-" + "cbc-aes-talitos-hsna", + .cra_blocksize =3D AES_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D AES_BLOCK_SIZE, + .maxauthsize =3D MD5_DIGEST_SIZE, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_MD5_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(md5),cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-md5-" + "cbc-3des-talitos", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D MD5_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_MD5_HMAC, + }, + { .type =3D CRYPTO_ALG_TYPE_AEAD, + .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .alg.aead =3D { + .base =3D { + .cra_name =3D "authenc(hmac(md5),cbc(des3_ede))", + .cra_driver_name =3D "authenc-hmac-md5-" + "cbc-3des-talitos-hsna", + .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, + .cra_flags =3D CRYPTO_ALG_ASYNC | + CRYPTO_ALG_ALLOCATES_MEMORY, + }, + .ivsize =3D DES3_EDE_BLOCK_SIZE, + .maxauthsize =3D MD5_DIGEST_SIZE, + .setkey =3D aead_des3_setkey, + }, + .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_MD5_HMAC, + }, +}; + +int talitos_register_aead(struct device *dev) +{ + struct talitos_private *priv =3D dev_get_drvdata(dev); + struct aead_alg *aead_alg; + struct crypto_alg *alg; + size_t i; + int ret; + + for (i =3D 0; i < ARRAY_SIZE(aead_driver_algs); i++) { + if (!talitos_hw_supports(dev, + aead_driver_algs[i].desc_hdr_template)) + continue; + + aead_alg =3D &aead_driver_algs[i].alg.aead; + alg =3D &aead_alg->base; + + alg->cra_exit =3D talitos_cra_exit; + if (has_ftr_sec1(priv)) + alg->cra_alignmask =3D 3; + + aead_alg->init =3D talitos_cra_init_aead; + aead_alg->setkey =3D aead_alg->setkey ?: aead_setkey; + aead_alg->encrypt =3D aead_encrypt; + aead_alg->decrypt =3D aead_decrypt; + if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) && + !strncmp(alg->cra_name, "authenc(hmac(sha224)", 20)) { + continue; + } + + ret =3D talitos_register_common(dev, &aead_driver_algs[i]); + if (ret) + return ret; + } + + return 0; +} diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 4b77253e04fa..52ff5ef46fb6 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -727,87 +727,6 @@ DEF_TALITOS2_INTERRUPT(ch0_2, TALITOS2_ISR_CH_0_2_DONE= , TALITOS2_ISR_CH_0_2_ERR, DEF_TALITOS2_INTERRUPT(ch1_3, TALITOS2_ISR_CH_1_3_DONE, TALITOS2_ISR_CH_1_= 3_ERR, 1) =20 - -/* - * crypto alg - */ -#define TALITOS_CRA_PRIORITY 3000 -/* - * Defines a priority for doing AEAD with descriptors type - * HMAC_SNOOP_NO_AFEA (HSNA) instead of type IPSEC_ESP - */ -#define TALITOS_CRA_PRIORITY_AEAD_HSNA (TALITOS_CRA_PRIORITY - 1) - -static int aead_setkey(struct crypto_aead *authenc, - const u8 *key, unsigned int keylen) -{ - struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); - struct device *dev =3D ctx->dev; - struct crypto_authenc_keys keys; - - if (crypto_authenc_extractkeys(&keys, key, keylen) !=3D 0) - goto badkey; - - if (keys.authkeylen + keys.enckeylen > TALITOS_MAX_KEY_SIZE) - goto badkey; - - if (ctx->keylen) - dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); - - memcpy(ctx->key, keys.authkey, keys.authkeylen); - memcpy(&ctx->key[keys.authkeylen], keys.enckey, keys.enckeylen); - - ctx->keylen =3D keys.authkeylen + keys.enckeylen; - ctx->enckeylen =3D keys.enckeylen; - ctx->authkeylen =3D keys.authkeylen; - ctx->dma_key =3D dma_map_single(dev, ctx->key, ctx->keylen, - DMA_TO_DEVICE); - - memzero_explicit(&keys, sizeof(keys)); - return 0; - -badkey: - memzero_explicit(&keys, sizeof(keys)); - return -EINVAL; -} - -static int aead_des3_setkey(struct crypto_aead *authenc, - const u8 *key, unsigned int keylen) -{ - struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); - struct device *dev =3D ctx->dev; - struct crypto_authenc_keys keys; - int err; - - err =3D crypto_authenc_extractkeys(&keys, key, keylen); - if (unlikely(err)) - goto out; - - err =3D -EINVAL; - if (keys.authkeylen + keys.enckeylen > TALITOS_MAX_KEY_SIZE) - goto out; - - err =3D verify_aead_des3_key(authenc, keys.enckey, keys.enckeylen); - if (err) - goto out; - - if (ctx->keylen) - dma_unmap_single(dev, ctx->dma_key, ctx->keylen, DMA_TO_DEVICE); - - memcpy(ctx->key, keys.authkey, keys.authkeylen); - memcpy(&ctx->key[keys.authkeylen], keys.enckey, keys.enckeylen); - - ctx->keylen =3D keys.authkeylen + keys.enckeylen; - ctx->enckeylen =3D keys.enckeylen; - ctx->authkeylen =3D keys.authkeylen; - ctx->dma_key =3D dma_map_single(dev, ctx->key, ctx->keylen, - DMA_TO_DEVICE); - -out: - memzero_explicit(&keys, sizeof(keys)); - return err; -} - void talitos_sg_unmap(struct device *dev, struct talitos_edesc *edesc, struct scatterlist *src, @@ -836,109 +755,6 @@ void talitos_sg_unmap(struct device *dev, } } =20 -static void ipsec_esp_unmap(struct device *dev, - struct talitos_edesc *edesc, - struct aead_request *areq, bool encrypt) -{ - struct crypto_aead *aead =3D crypto_aead_reqtfm(areq); - struct talitos_ctx *ctx =3D crypto_aead_ctx(aead); - unsigned int ivsize =3D crypto_aead_ivsize(aead); - unsigned int authsize =3D crypto_aead_authsize(aead); - unsigned int cryptlen =3D areq->cryptlen - (encrypt ? 0 : authsize); - bool is_ipsec_esp =3D edesc->desc.hdr & DESC_HDR_TYPE_IPSEC_ESP; - struct talitos_ptr *civ_ptr =3D &edesc->desc.ptr[is_ipsec_esp ? 2 : 3]; - - if (is_ipsec_esp) - unmap_single_talitos_ptr(dev, &edesc->desc.ptr[6], - DMA_FROM_DEVICE); - unmap_single_talitos_ptr(dev, civ_ptr, DMA_TO_DEVICE); - - talitos_sg_unmap(dev, edesc, areq->src, areq->dst, - cryptlen + authsize, areq->assoclen); - - if (edesc->dma_len) - dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len, - DMA_BIDIRECTIONAL); - - if (!is_ipsec_esp) { - unsigned int dst_nents =3D edesc->dst_nents ? : 1; - - sg_pcopy_to_buffer(areq->dst, dst_nents, ctx->iv, ivsize, - areq->assoclen + cryptlen - ivsize); - } -} - -/* - * ipsec_esp descriptor callbacks - */ -static void ipsec_esp_encrypt_done(struct device *dev, - struct talitos_desc *desc, void *context, - int err) -{ - struct aead_request *areq =3D context; - struct crypto_aead *authenc =3D crypto_aead_reqtfm(areq); - unsigned int ivsize =3D crypto_aead_ivsize(authenc); - struct talitos_edesc *edesc; - - edesc =3D container_of(desc, struct talitos_edesc, desc); - - ipsec_esp_unmap(dev, edesc, areq, true); - - dma_unmap_single(dev, edesc->iv_dma, ivsize, DMA_TO_DEVICE); - - kfree(edesc); - - aead_request_complete(areq, err); -} - -static void ipsec_esp_decrypt_swauth_done(struct device *dev, - struct talitos_desc *desc, - void *context, int err) -{ - struct aead_request *req =3D context; - struct crypto_aead *authenc =3D crypto_aead_reqtfm(req); - unsigned int authsize =3D crypto_aead_authsize(authenc); - struct talitos_edesc *edesc; - char *oicv, *icv; - - edesc =3D container_of(desc, struct talitos_edesc, desc); - - ipsec_esp_unmap(dev, edesc, req, false); - - if (!err) { - /* auth check */ - oicv =3D edesc->buf + edesc->dma_len; - icv =3D oicv - authsize; - - err =3D crypto_memneq(oicv, icv, authsize) ? -EBADMSG : 0; - } - - kfree(edesc); - - aead_request_complete(req, err); -} - -static void ipsec_esp_decrypt_hwauth_done(struct device *dev, - struct talitos_desc *desc, - void *context, int err) -{ - struct aead_request *req =3D context; - struct talitos_edesc *edesc; - - edesc =3D container_of(desc, struct talitos_edesc, desc); - - ipsec_esp_unmap(dev, edesc, req, false); - - /* check ICV auth status */ - if (!err && ((desc->hdr_lo & DESC_HDR_LO_ICCR1_MASK) !=3D - DESC_HDR_LO_ICCR1_PASS)) - err =3D -EBADMSG; - - kfree(edesc); - - aead_request_complete(req, err); -} - /* * convert scatterlist to SEC h/w link table format * stop at cryptlen bytes @@ -1039,132 +855,6 @@ int talitos_sg_map(struct device *dev, struct scatte= rlist *src, tbl_off, 0, false, 1); } =20 -/* - * fill in and submit ipsec_esp descriptor - */ -static int ipsec_esp(struct talitos_edesc *edesc, struct aead_request *are= q, - bool encrypt, - void (*callback)(struct device *dev, - struct talitos_desc *desc, - void *context, int error)) -{ - struct crypto_aead *aead =3D crypto_aead_reqtfm(areq); - unsigned int authsize =3D crypto_aead_authsize(aead); - struct talitos_ctx *ctx =3D crypto_aead_ctx(aead); - struct device *dev =3D ctx->dev; - struct talitos_desc *desc =3D &edesc->desc; - unsigned int cryptlen =3D areq->cryptlen - (encrypt ? 0 : authsize); - unsigned int ivsize =3D crypto_aead_ivsize(aead); - int tbl_off =3D 0; - int sg_count, ret; - int elen =3D 0; - bool sync_needed =3D false; - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); - bool is_ipsec_esp =3D desc->hdr & DESC_HDR_TYPE_IPSEC_ESP; - struct talitos_ptr *civ_ptr =3D &desc->ptr[is_ipsec_esp ? 2 : 3]; - struct talitos_ptr *ckey_ptr =3D &desc->ptr[is_ipsec_esp ? 3 : 2]; - dma_addr_t dma_icv =3D edesc->dma_link_tbl + edesc->dma_len - authsize; - - /* hmac key */ - to_talitos_ptr(&desc->ptr[0], ctx->dma_key, ctx->authkeylen, is_sec1); - - sg_count =3D edesc->src_nents ?: 1; - if (is_sec1 && sg_count > 1) - sg_copy_to_buffer(areq->src, sg_count, edesc->buf, - areq->assoclen + cryptlen); - else - sg_count =3D dma_map_sg(dev, areq->src, sg_count, - (areq->src =3D=3D areq->dst) ? - DMA_BIDIRECTIONAL : DMA_TO_DEVICE); - - /* hmac data */ - ret =3D talitos_sg_map(dev, areq->src, areq->assoclen, edesc, - &desc->ptr[1], sg_count, 0, tbl_off); - - if (ret > 1) { - tbl_off +=3D ret; - sync_needed =3D true; - } - - /* cipher iv */ - to_talitos_ptr(civ_ptr, edesc->iv_dma, ivsize, is_sec1); - - /* cipher key */ - to_talitos_ptr(ckey_ptr, ctx->dma_key + ctx->authkeylen, - ctx->enckeylen, is_sec1); - - /* - * cipher in - * map and adjust cipher len to aead request cryptlen. - * extent is bytes of HMAC postpended to ciphertext, - * typically 12 for ipsec - */ - if (is_ipsec_esp && (desc->hdr & DESC_HDR_MODE1_MDEU_CICV)) - elen =3D authsize; - - ret =3D talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->ptr[4], - sg_count, areq->assoclen, tbl_off, elen, - false, 1); - - if (ret > 1) { - tbl_off +=3D ret; - sync_needed =3D true; - } - - /* cipher out */ - if (areq->src !=3D areq->dst) { - sg_count =3D edesc->dst_nents ? : 1; - if (!is_sec1 || sg_count =3D=3D 1) - dma_map_sg(dev, areq->dst, sg_count, DMA_FROM_DEVICE); - } - - if (is_ipsec_esp && encrypt) - elen =3D authsize; - else - elen =3D 0; - ret =3D talitos_sg_map_ext(dev, areq->dst, cryptlen, edesc, &desc->ptr[5], - sg_count, areq->assoclen, tbl_off, elen, - is_ipsec_esp && !encrypt, 1); - tbl_off +=3D ret; - - if (!encrypt && is_ipsec_esp) { - struct talitos_ptr *tbl_ptr =3D &edesc->link_tbl[tbl_off]; - - /* Add an entry to the link table for ICV data */ - to_talitos_ptr_ext_set(tbl_ptr - 1, 0, is_sec1); - to_talitos_ptr_ext_set(tbl_ptr, DESC_PTR_LNKTBL_RET, is_sec1); - - /* icv data follows link tables */ - to_talitos_ptr(tbl_ptr, dma_icv, authsize, is_sec1); - to_talitos_ptr_ext_or(&desc->ptr[5], authsize, is_sec1); - sync_needed =3D true; - } else if (!encrypt) { - to_talitos_ptr(&desc->ptr[6], dma_icv, authsize, is_sec1); - sync_needed =3D true; - } else if (!is_ipsec_esp) { - talitos_sg_map(dev, areq->dst, authsize, edesc, &desc->ptr[6], - sg_count, areq->assoclen + cryptlen, tbl_off); - } - - /* iv out */ - if (is_ipsec_esp) - map_single_talitos_ptr(dev, &desc->ptr[6], ivsize, ctx->iv, - DMA_FROM_DEVICE); - - if (sync_needed) - dma_sync_single_for_device(dev, edesc->dma_link_tbl, - edesc->dma_len, - DMA_BIDIRECTIONAL); - - ret =3D talitos_submit(dev, ctx->ch, desc, callback, areq); - if (ret !=3D -EINPROGRESS) { - ipsec_esp_unmap(dev, edesc, areq, encrypt); - kfree(edesc); - } - return ret; -} - /* * allocate and map the extended descriptor */ @@ -1263,540 +953,6 @@ struct talitos_edesc *talitos_edesc_alloc(struct dev= ice *dev, return edesc; } =20 -static struct talitos_edesc *aead_edesc_alloc(struct aead_request *areq, u= 8 *iv, - int icv_stashing, bool encrypt) -{ - struct crypto_aead *authenc =3D crypto_aead_reqtfm(areq); - unsigned int authsize =3D crypto_aead_authsize(authenc); - struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); - unsigned int ivsize =3D crypto_aead_ivsize(authenc); - unsigned int cryptlen =3D areq->cryptlen - (encrypt ? 0 : authsize); - - return talitos_edesc_alloc(ctx->dev, areq->src, areq->dst, - iv, areq->assoclen, cryptlen, - authsize, ivsize, icv_stashing, - areq->base.flags, encrypt); -} - -static int aead_encrypt(struct aead_request *req) -{ - struct crypto_aead *authenc =3D crypto_aead_reqtfm(req); - struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); - struct talitos_edesc *edesc; - - /* allocate extended descriptor */ - edesc =3D aead_edesc_alloc(req, req->iv, 0, true); - if (IS_ERR(edesc)) - return PTR_ERR(edesc); - - /* set encrypt */ - edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; - - return ipsec_esp(edesc, req, true, ipsec_esp_encrypt_done); -} - -static int aead_decrypt(struct aead_request *req) -{ - struct crypto_aead *authenc =3D crypto_aead_reqtfm(req); - unsigned int authsize =3D crypto_aead_authsize(authenc); - struct talitos_ctx *ctx =3D crypto_aead_ctx(authenc); - struct talitos_private *priv =3D dev_get_drvdata(ctx->dev); - struct talitos_edesc *edesc; - void *icvdata; - - /* allocate extended descriptor */ - edesc =3D aead_edesc_alloc(req, req->iv, 1, false); - if (IS_ERR(edesc)) - return PTR_ERR(edesc); - - if ((edesc->desc.hdr & DESC_HDR_TYPE_IPSEC_ESP) && - (priv->features & TALITOS_FTR_HW_AUTH_CHECK) && - ((!edesc->src_nents && !edesc->dst_nents) || - priv->features & TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT)) { - - /* decrypt and check the ICV */ - edesc->desc.hdr =3D ctx->desc_hdr_template | - DESC_HDR_DIR_INBOUND | - DESC_HDR_MODE1_MDEU_CICV; - - /* reset integrity check result bits */ - - return ipsec_esp(edesc, req, false, - ipsec_esp_decrypt_hwauth_done); - } - - /* Have to check the ICV with software */ - edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND; - - /* stash incoming ICV for later cmp with ICV generated by the h/w */ - icvdata =3D edesc->buf + edesc->dma_len; - - sg_pcopy_to_buffer(req->src, edesc->src_nents ? : 1, icvdata, authsize, - req->assoclen + req->cryptlen - authsize); - - return ipsec_esp(edesc, req, false, ipsec_esp_decrypt_swauth_done); -} - -static struct talitos_alg_template driver_algs[] =3D { - /* AEAD algorithms. These use a single-pass ipsec_esp descriptor */ - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha1),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha1-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA1_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA1_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha1),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha1-" - "cbc-aes-talitos-hsna", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA1_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA1_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha1)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha1-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA1_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA1_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha1)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha1-" - "cbc-3des-talitos-hsna", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA1_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA1_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha224),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha224-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA224_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA224_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha224),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha224-" - "cbc-aes-talitos-hsna", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA224_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA224_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha224)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha224-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA224_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA224_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha224)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha224-" - "cbc-3des-talitos-hsna", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA224_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA224_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha256),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha256-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA256_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA256_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha256),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha256-" - "cbc-aes-talitos-hsna", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA256_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA256_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha256)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha256-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA256_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA256_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha256)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha256-" - "cbc-3des-talitos-hsna", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA256_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA256_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha384),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha384-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA384_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUB | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEUB_SHA384_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha384)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha384-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA384_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUB | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEUB_SHA384_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha512),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha512-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA512_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUB | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEUB_SHA512_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha512)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha512-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA512_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUB | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEUB_SHA512_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(md5),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-md5-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D MD5_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_MD5_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(md5),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-md5-" - "cbc-aes-talitos-hsna", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D MD5_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_MD5_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(md5),cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-md5-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D MD5_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_MD5_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(md5),cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-md5-" - "cbc-3des-talitos-hsna", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D MD5_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_MD5_HMAC, - }, -}; - int talitos_init_common(struct talitos_ctx *ctx, struct talitos_crypto_alg *talitos_alg) { @@ -1819,18 +975,6 @@ int talitos_init_common(struct talitos_ctx *ctx, return 0; } =20 -static int talitos_cra_init_aead(struct crypto_aead *tfm) -{ - struct aead_alg *alg =3D crypto_aead_alg(tfm); - struct talitos_crypto_alg *talitos_alg; - struct talitos_ctx *ctx =3D crypto_aead_ctx(tfm); - - talitos_alg =3D container_of(alg, struct talitos_crypto_alg, - algt.alg.aead); - - return talitos_init_common(ctx, talitos_alg); -} - void talitos_cra_exit(struct crypto_tfm *tfm) { struct talitos_ctx *ctx =3D crypto_tfm_ctx(tfm); @@ -1941,6 +1085,12 @@ int talitos_register_common(struct device *dev, t_alg->algt.type); ret =3D crypto_register_skcipher(&t_alg->algt.alg.skcipher); break; + case CRYPTO_ALG_TYPE_AEAD: + alg =3D &t_alg->algt.alg.aead.base; + talitos_alg_set_common(priv, alg, t_alg->algt.priority, + t_alg->algt.type); + ret =3D crypto_register_aead(&t_alg->algt.alg.aead); + break; default: dev_err(dev, "unknown algorithm type %d\n", t_alg->algt.type); devm_kfree(dev, t_alg); @@ -1961,59 +1111,6 @@ int talitos_register_common(struct device *dev, return 0; } =20 -static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev, - struct talitos_alg_template - *template) -{ - struct talitos_private *priv =3D dev_get_drvdata(dev); - struct talitos_crypto_alg *t_alg; - struct crypto_alg *alg; - - t_alg =3D devm_kzalloc(dev, sizeof(struct talitos_crypto_alg), - GFP_KERNEL); - if (!t_alg) - return ERR_PTR(-ENOMEM); - - t_alg->algt =3D *template; - - switch (t_alg->algt.type) { - case CRYPTO_ALG_TYPE_AEAD: - alg =3D &t_alg->algt.alg.aead.base; - alg->cra_exit =3D talitos_cra_exit; - t_alg->algt.alg.aead.init =3D talitos_cra_init_aead; - t_alg->algt.alg.aead.setkey =3D t_alg->algt.alg.aead.setkey ?: - aead_setkey; - t_alg->algt.alg.aead.encrypt =3D aead_encrypt; - t_alg->algt.alg.aead.decrypt =3D aead_decrypt; - if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) && - !strncmp(alg->cra_name, "authenc(hmac(sha224)", 20)) { - devm_kfree(dev, t_alg); - return ERR_PTR(-ENOTSUPP); - } - break; - default: - dev_err(dev, "unknown algorithm type %d\n", t_alg->algt.type); - devm_kfree(dev, t_alg); - return ERR_PTR(-EINVAL); - } - - alg->cra_module =3D THIS_MODULE; - if (t_alg->algt.priority) - alg->cra_priority =3D t_alg->algt.priority; - else - alg->cra_priority =3D TALITOS_CRA_PRIORITY; - if (has_ftr_sec1(priv) && t_alg->algt.type !=3D CRYPTO_ALG_TYPE_AHASH) - alg->cra_alignmask =3D 3; - else - alg->cra_alignmask =3D 0; - alg->cra_ctxsize =3D sizeof(struct talitos_ctx); - alg->cra_flags |=3D CRYPTO_ALG_KERN_DRIVER_ONLY; - - t_alg->dev =3D dev; - - return t_alg; -} - static int talitos_probe_irq(struct platform_device *ofdev) { struct device *dev =3D &ofdev->dev; @@ -2227,36 +1324,10 @@ static int talitos_probe(struct platform_device *of= dev) if (err) goto err_out; =20 - /* register crypto algorithms the device supports */ - for (i =3D 0; i < ARRAY_SIZE(driver_algs); i++) { - if (talitos_hw_supports(dev, - driver_algs[i].desc_hdr_template)) { - struct talitos_crypto_alg *t_alg; - struct crypto_alg *alg =3D NULL; - - t_alg =3D talitos_alg_alloc(dev, &driver_algs[i]); - if (IS_ERR(t_alg)) { - err =3D PTR_ERR(t_alg); - if (err =3D=3D -ENOTSUPP) - continue; - goto err_out; - } + err =3D talitos_register_aead(dev); + if (err) + goto err_out; =20 - switch (t_alg->algt.type) { - case CRYPTO_ALG_TYPE_AEAD: - err =3D crypto_register_aead( - &t_alg->algt.alg.aead); - alg =3D &t_alg->algt.alg.aead.base; - break; - } - if (err) { - dev_err(dev, "%s alg registration failed\n", - alg->cra_driver_name); - devm_kfree(dev, t_alg); - } else - list_add_tail(&t_alg->entry, &priv->alg_list); - } - } if (!list_empty(&priv->alg_list)) dev_info(dev, "%s algorithms registered in /proc/crypto\n", (char *)of_get_property(np, "compatible", NULL)); diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index 4a803ad6349d..e36a2609d87d 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -21,6 +21,8 @@ #define TALITOS1_MAX_DATA_LEN 32768 #define TALITOS2_MAX_DATA_LEN 65535 =20 +#define TALITOS_CRA_PRIORITY 3000 + #define DESC_TYPE(desc_hdr) ((be32_to_cpu(desc_hdr) >> 3) & 0x1f) #define PRIMARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 28) & 0xf) #define SECONDARY_EU(desc_hdr) ((be32_to_cpu(desc_hdr) >> 16) & 0xf) @@ -611,3 +613,4 @@ void talitos_unregister_rng(struct device *dev); =20 int talitos_register_hash(struct device *dev); int talitos_register_skcipher(struct device *dev); +int talitos_register_aead(struct device *dev); --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D3ADF38BF7A for ; Tue, 21 Jul 2026 13:59:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642398; cv=none; b=FNkn4qmyyqNKp9Q17okq9F3nONnBSwdCogJquabd0E+2iy1Huc5qBQoB37ZNuUdJmUw+RYJ6NsYzMg3K/TvhXNnyakwQ+PsLoEbfBPkXc6Z+h04qePubb0eifhd5TvZ+UcpIwYW+eMQp2nui5HW+BOp8H0NNsqACVrpHIA4u2RI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642398; c=relaxed/simple; bh=tcAsVIEP0WA025bFHEQ8n008ZR3mLAJNNfU7TV6DG4w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VnF+FXt7DiBIsvBFhQIVp9zOntaqbyjSYTQ83LWjYzCCdmdYrb/XLvsqarVRWlOBG4Z8pmvdin2apRs3jgPhWugm7Czry/E1S0rV+H2FktrSCty+oV746LTocr4Ej43Ilwbi/3HUHRjnK01tJkV3dB7L1qpyeRdpbF/A5lo7EF4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=nrz643OK; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="nrz643OK" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 8538E4E40EA3; Tue, 21 Jul 2026 13:59:55 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 5A61060368; Tue, 21 Jul 2026 13:59:55 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0801711BD3C87; Tue, 21 Jul 2026 15:59:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642394; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Hu8d132vLTIeGU/ZnMMsO8UYo1IBLj/ZtJ1suo/onNc=; b=nrz643OK+C7gIYkWzm7QopeZZK2Erl1stmm+OOuSHTtuTarAxKgi3ooWGjCFmteoLXWKUb WFXHnarrVAbZ+MOS9Lt6eEF8A9nx5r7iYG9lT7JTdV3wyQpZwrTV1AiLM2ry2a3VbatN29 8otEX4b2p+Eke4VhWv+EDjHvjLRzf/amMi7bHERqSoDVYL0zcKlSJirRTuLG/GZMtKxR3q 1mE3nf4nmTW4nUj7zPQJvuUbf7fN8K/YmTm6jYXFqmK+m2/etliqP58qS4w4dQvTpzBI4C TW61EpqAoP4V/ZVC796lWVCYf8Qi4IU0DP2Lmt35/J0fWG30rW7FK5/P0/nsDg== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:36 +0200 Subject: [PATCH v3 09/19] crypto: talitos/hash - Convert to {init,exit}_tfm type-specific API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-9-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=2070; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=tcAsVIEP0WA025bFHEQ8n008ZR3mLAJNNfU7TV6DG4w=; b=U88ujpGXgngfYo/OqDTea7QU/11vgx9k4CpkfQxSZKRGsqQdW6noNS3kIj2PWp36dbb9eX1aT SVPF4d+fiUPDld9RXbqdRtTgbQA9rm4T806aF+a6sBiTGeJcT/IBqvV X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Since commit 6eed1e3552fc0 ("crypto: api - Mark cra_init/cra_exit as deprecated"), both cra_{init,exit} are deprecated. Use {init,exit}_tfm instead. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos-hash.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/crypto/talitos/talitos-hash.c b/drivers/crypto/talitos= /talitos-hash.c index bce9f9901ce8..f9930f6e9291 100644 --- a/drivers/crypto/talitos/talitos-hash.c +++ b/drivers/crypto/talitos/talitos-hash.c @@ -535,13 +535,13 @@ static int ahash_setkey(struct crypto_ahash *tfm, con= st u8 *key, return 0; } =20 -static int talitos_cra_init_ahash(struct crypto_tfm *tfm) +static int talitos_cra_init_ahash(struct crypto_ahash *tfm) { - struct crypto_alg *alg =3D tfm->__crt_alg; + struct ahash_alg *alg =3D crypto_ahash_alg(tfm); struct talitos_crypto_alg *talitos_alg; - struct talitos_ctx *ctx =3D crypto_tfm_ctx(tfm); + struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); =20 - talitos_alg =3D container_of(__crypto_ahash_alg(alg), + talitos_alg =3D container_of(alg, struct talitos_crypto_alg, algt.alg.hash); =20 @@ -550,6 +550,11 @@ static int talitos_cra_init_ahash(struct crypto_tfm *t= fm) return talitos_init_common(ctx, talitos_alg); } =20 +static void talitos_cra_exit_ahash(struct crypto_ahash *tfm) +{ + talitos_cra_exit(crypto_ahash_tfm(tfm)); +} + static struct talitos_alg_template hash_driver_algs[] =3D { { .type =3D CRYPTO_ALG_TYPE_AHASH, .alg.hash =3D { @@ -785,8 +790,8 @@ int talitos_register_hash(struct device *dev) ahash_alg =3D &hash_driver_algs[i].alg.hash; alg =3D &ahash_alg->halg.base; =20 - alg->cra_init =3D talitos_cra_init_ahash; - alg->cra_exit =3D talitos_cra_exit; + ahash_alg->init_tfm =3D talitos_cra_init_ahash; + ahash_alg->exit_tfm =3D talitos_cra_exit_ahash; ahash_alg->init =3D ahash_init; ahash_alg->update =3D ahash_update; ahash_alg->final =3D ahash_final; --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E20A738D6A4; Tue, 21 Jul 2026 13:59:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642399; cv=none; b=IXORTglBULeb7uAajzr3pqC1VT3WvwG/YvUdy+wLDlLPQ6EOTze5khoS4e6Rl4PHBUOJgZoRkYOttVHHuEWMnUVPkQQ68fO6Hkv+nspBz5PTwXjq6Kk3ZtELrds6brhTywmbNfK+7A3/by1WQGnPLcjQAH6QriTZ6sCCTbkFlUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642399; c=relaxed/simple; bh=UsgMeXb+xD450DlXo0sUNp1f3i6t+UL4yiUGMQwHJD4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kou0QF8p4GZOxkFrieGjHpS7Fwb3hGLSyDu90HS0Y+fhvFID8cTbVNYOAW3rcJzJusM1K0hHD/bZpoE+cG9PR4pFMCyQ+vJMCMcKM0I+JDkmP48nVJjXmmnfHEXlQA7bAjbcIgwd3jIxfwAHnlKbAnaYqzlcvYZgtfa9buX5DAo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=TMyYvn5r; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="TMyYvn5r" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 979F71A113B; Tue, 21 Jul 2026 13:59:56 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 6C9F060368; Tue, 21 Jul 2026 13:59:56 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0C0EE11BD2635; Tue, 21 Jul 2026 15:59:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642395; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=06dy/eE9MMgD6V8DX2mp1KbEd1TIQFh8VpE1PyHmcIo=; b=TMyYvn5rLS0Pzhp1kOjjKYMW3vHoagR1/RmOUkkvPpde6QE2uP7yln4vjvGiyRX69nD2yZ 1rxBQ1PxDSIVvBkSY6+ltI2TorG5nRqtDkZkl2Ys6o8G+daiqztdibzMRAPK+8CVUm9HU0 EhpUyRnhL1DOXQPHk4uxZmbs/SRVC+Jg5l3VWEp+v4YlKfJzxH3/+Rmt/ti4+bo2oe4oCG PVZ8dn8n36uyY61P85L9XdRrPQDeXg52uU9m1dplmVrAtGk5nNfAMgqe+H/5B3IyKx9HxU NaUUpSh1c3GGZ7Vvntj8p593S3/sHMuJvT0l8D+XObVB73NxcgCB7WyM8dhFQg== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:37 +0200 Subject: [PATCH v3 10/19] crypto: talitos/skcipher - Convert to {init,exit}_tfm type-specific API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-10-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=1562; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=UsgMeXb+xD450DlXo0sUNp1f3i6t+UL4yiUGMQwHJD4=; b=OcHvFHmKLvhv4Sjc31raqurISNwwczeb9/v0sHNgvRr+XEvD85r45zw9o0l1S7i7Ipc+nZOG/ 40RZXi2856CCVkRXqGJm5XLn51N/xxlKlnUWc+I1GWvMbeq3N00vY7A X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Since commit 6eed1e3552fc0 ("crypto: api - Mark cra_init/cra_exit as deprecated"), both cra_{init,exit} are deprecated. Use {init,exit}_tfm instead. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos-skcipher.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/talitos/talitos-skcipher.c b/drivers/crypto/tal= itos/talitos-skcipher.c index f80373610aa4..4c03573efb0a 100644 --- a/drivers/crypto/talitos/talitos-skcipher.c +++ b/drivers/crypto/talitos/talitos-skcipher.c @@ -232,6 +232,11 @@ static int talitos_cra_init_skcipher(struct crypto_skc= ipher *tfm) return talitos_init_common(ctx, talitos_alg); } =20 +static void talitos_cra_exit_skcipher(struct crypto_skcipher *tfm) +{ + talitos_cra_exit(crypto_skcipher_tfm(tfm)); +} + static struct talitos_alg_template skcipher_driver_algs[] =3D { { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, .alg.skcipher =3D { @@ -375,11 +380,11 @@ int talitos_register_skcipher(struct device *dev) skcipher_alg =3D &skcipher_driver_algs[i].alg.skcipher; alg =3D &skcipher_alg->base; =20 - alg->cra_exit =3D talitos_cra_exit; if (has_ftr_sec1(priv)) alg->cra_alignmask =3D 3; =20 skcipher_alg->init =3D talitos_cra_init_skcipher; + skcipher_alg->exit =3D talitos_cra_exit_skcipher; skcipher_alg->setkey =3D skcipher_alg->setkey ?: skcipher_setkey; skcipher_alg->encrypt =3D skcipher_encrypt; skcipher_alg->decrypt =3D skcipher_decrypt; --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F400C39280A; Tue, 21 Jul 2026 13:59:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642400; cv=none; b=KXEeyA9whZzw9Ypb6AgfnmXs5VDCgRG92rW1vuTZ7ARxhKY36oHCfudRemuK42quWm6HahCgAjCl40o326Fgx9Hv9WnX6CLRKVb7R3X+sFpghATKKE4/Qw7/C/73DGFhKvUSpGY+uvV0ZojtqknrLu1xwqDdg9a17iJzAwigi6Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642400; c=relaxed/simple; bh=dH3V5FzEunV71NpnVP0ViObSQfSyFk7jQKfBkvAUnWA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mTjxnMu3r63TuIAg4P/KcEUV0S8L/hKRugVbQRWvYc030Zz6KTHAXvieYZL6W5yLS3YDBzNlgRk8vf/bOYTwn/3B8a7Smiq6e1IAGr2KbRH/XdWZ+ddSGjmLLOSxVbdmqK3BNlJhgP6V0z6ETNY1c08UDiN5u2E/QW7mkUicpS8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=iRTwioIs; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="iRTwioIs" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id A34A81A113F; Tue, 21 Jul 2026 13:59:57 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 786F860368; Tue, 21 Jul 2026 13:59:57 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 243D011BD3A55; Tue, 21 Jul 2026 15:59:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642396; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=/tIL/35xhzaQ98GIYg8OANcAB6TmHi6jm7IH4IqH7Xg=; b=iRTwioIsc5lFirUM3XVHqJqsOhrDbD/TQh4JRNqaqzdcOGN+K7AXG9fAf8owbaj2omTy4J OIfeHmL5dLHue0orlaMa1VXsudc3XDUF59/dK4jPez8S1VSJNxKSy8tEz060+KDTybup28 r1LNA4OVGmZyYMsRPYHbALvx/hJNvynGbRw0VP0Sxr0s+tFFge4ncIHP4Df7LQm/lp0L/S RXibgA134W4d9cTPL4A/d/bbO5NAPYvxvTYID2cAJg4H3hiWmRexL1YRrYK39G3Bs5bHLK dWcEcBBgNvhiJgvOk1QQtjEfjxHYSMjVVoDxfDe9NTcOZ+adlP4ZECkn2CheRQ== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:38 +0200 Subject: [PATCH v3 11/19] crypto: talitos/aead - Convert to {init,exit}_tfm type-specific API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-11-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=1446; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=dH3V5FzEunV71NpnVP0ViObSQfSyFk7jQKfBkvAUnWA=; b=0MPLTWx/Insa6ZU+UUzlkfTq1MQ/d+WHrSXY3Vr7aRp4akTo5lj6Sm+x1cOLZtKoSYp5w6uO7 yUokLxPz7cnDnQELjSNqEffI25lJY6vKw66/LvKImRoQ1IXr2ltSI13 X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Since commit 6eed1e3552fc0 ("crypto: api - Mark cra_init/cra_exit as deprecated"), both cra_{init,exit} are deprecated. Use {init,exit}_tfm instead. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos-aead.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c index ced314a645db..5537f2b6317f 100644 --- a/drivers/crypto/talitos/talitos-aead.c +++ b/drivers/crypto/talitos/talitos-aead.c @@ -400,6 +400,11 @@ static int talitos_cra_init_aead(struct crypto_aead *t= fm) return talitos_init_common(ctx, talitos_alg); } =20 +static void talitos_cra_exit_aead(struct crypto_aead *tfm) +{ + talitos_cra_exit(crypto_aead_tfm(tfm)); +} + static struct talitos_alg_template aead_driver_algs[] =3D { { .type =3D CRYPTO_ALG_TYPE_AEAD, .alg.aead =3D { @@ -875,11 +880,11 @@ int talitos_register_aead(struct device *dev) aead_alg =3D &aead_driver_algs[i].alg.aead; alg =3D &aead_alg->base; =20 - alg->cra_exit =3D talitos_cra_exit; if (has_ftr_sec1(priv)) alg->cra_alignmask =3D 3; =20 aead_alg->init =3D talitos_cra_init_aead; + aead_alg->exit =3D talitos_cra_exit_aead; aead_alg->setkey =3D aead_alg->setkey ?: aead_setkey; aead_alg->encrypt =3D aead_encrypt; aead_alg->decrypt =3D aead_decrypt; --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DC15396585; Tue, 21 Jul 2026 14:00:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642402; cv=none; b=BZgvobAt6JCpzzXPwYtnrPUtF9gXmEby+8n8DjA6Mn7RJI38r4j8G8dY0ss7eirnK6caZuqWBZn7evCGY1Qypagxasb/OICvCaRuK0GTgJ1hejYnCPUZMJ+01W4wI9PPqDk3jUpqa6A0G6IoOVjC0Rv0IhufPi9OlRynvJwLNEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642402; c=relaxed/simple; bh=8uZtCoVmeWeI4IDHLyy/Rbyw77sbPKEguph20zVWoSY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NHs8zfZJ2dcgB5DT7HdiEG/nkwOGSkaNPTicSqZEPDP/gD0laFNGqSoGuSHRKX5eya65E3nigIOV3dn6MzKb+a0iqeqSEGcxJR7iv5coD8rXTdPCLzuDC5kbUcGyrw9slOJcnRjRUfdhUC0S3EiqyWJKwii/TM9vpugALELINBU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=t+EQsPOV; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="t+EQsPOV" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id BC15D1A113A; Tue, 21 Jul 2026 13:59:58 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 91E7D60368; Tue, 21 Jul 2026 13:59:58 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2DEE711BD3B69; Tue, 21 Jul 2026 15:59:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642397; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=3FLQ+2cxtM8Y9ID9kU3MTxiEs9hzTPixyFokAsJtfmU=; b=t+EQsPOVGFi1aTlmo2D7SUR6ib67OXApaqyjzg1JtS7NWaFZkQ4Fj+ejW0ZMkd73myZxfM EqC4EgrRaoYMMFnghxKpOu54CUaoDr4Ius0TbtzcVeZHStMttUeAiXUK0/VTXOgVHFrd52 qqtRqMYq6g9t7v8o8G4xPHXyZ1rsZxdDBqOdNu07VnLk646Q6fkL8f2caHRaO5H3SOGJ3c DXuPbW5IFhynUXXm+EwsHW1jjCZIYMPtZs5qKr/ilR6VpRQPvmnDnGz6CKk56V7iLBOK5x 4enQmhHu78x7HSIL0x9JWGSgub5ZCccnDsPa7tx9N97fzqNfDjqFiMFSKev75g== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:39 +0200 Subject: [PATCH v3 12/19] crypto: talitos/hash - Use macro for algorithm definitions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-12-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=13258; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=8uZtCoVmeWeI4IDHLyy/Rbyw77sbPKEguph20zVWoSY=; b=74NmbSHxXp7Ruy2Vm1u4ZGzuZfHDJQr3vXOAv9TKg+jjW+8i6uy4248ABtXGEQSk7jABDdiRM 1TZjHkty5m/CR6btAbp0AWlwHyj4ocmcssv4ArxonBDxxDZK6LZtiex X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Replace the repetitive struct initializer entries with preprocessor macros. The HMAC setkey assignment, previously done by comparing the algorithm name at runtime, is now handled by passing ahash_setkey directly through the TALITOS_HMAC_HASH_ALG macro variant. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos-hash.c | 331 +++++++++++-------------------= ---- 1 file changed, 103 insertions(+), 228 deletions(-) diff --git a/drivers/crypto/talitos/talitos-hash.c b/drivers/crypto/talitos= /talitos-hash.c index f9930f6e9291..f90018d4e219 100644 --- a/drivers/crypto/talitos/talitos-hash.c +++ b/drivers/crypto/talitos/talitos-hash.c @@ -555,223 +555,110 @@ static void talitos_cra_exit_ahash(struct crypto_ah= ash *tfm) talitos_cra_exit(crypto_ahash_tfm(tfm)); } =20 -static struct talitos_alg_template hash_driver_algs[] =3D { - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D MD5_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "md5", - .cra_driver_name =3D "md5-talitos", - .cra_blocksize =3D MD5_HMAC_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_MD5, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA1_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha1", - .cra_driver_name =3D "sha1-talitos", - .cra_blocksize =3D SHA1_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA1, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA224_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha224", - .cra_driver_name =3D "sha224-talitos", - .cra_blocksize =3D SHA224_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA224, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA256_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha256", - .cra_driver_name =3D "sha256-talitos", - .cra_blocksize =3D SHA256_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA256, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA384_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha384", - .cra_driver_name =3D "sha384-talitos", - .cra_blocksize =3D SHA384_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUB | - DESC_HDR_MODE0_MDEUB_SHA384, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA512_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "sha512", - .cra_driver_name =3D "sha512-talitos", - .cra_blocksize =3D SHA512_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUB | - DESC_HDR_MODE0_MDEUB_SHA512, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D MD5_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(md5)", - .cra_driver_name =3D "hmac-md5-talitos", - .cra_blocksize =3D MD5_HMAC_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_MD5, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA1_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha1)", - .cra_driver_name =3D "hmac-sha1-talitos", - .cra_blocksize =3D SHA1_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA1, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA224_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha224)", - .cra_driver_name =3D "hmac-sha224-talitos", - .cra_blocksize =3D SHA224_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA224, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA256_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha256)", - .cra_driver_name =3D "hmac-sha256-talitos", - .cra_blocksize =3D SHA256_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUA | - DESC_HDR_MODE0_MDEU_SHA256, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA384_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha384)", - .cra_driver_name =3D "hmac-sha384-talitos", - .cra_blocksize =3D SHA384_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUB | - DESC_HDR_MODE0_MDEUB_SHA384, - }, - { .type =3D CRYPTO_ALG_TYPE_AHASH, - .alg.hash =3D { - .halg.digestsize =3D SHA512_DIGEST_SIZE, - .halg.statesize =3D sizeof(struct talitos_export_state), - .halg.base =3D { - .cra_name =3D "hmac(sha512)", - .cra_driver_name =3D "hmac-sha512-talitos", - .cra_blocksize =3D SHA512_BLOCK_SIZE, - .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY | - CRYPTO_AHASH_ALG_BLOCK_ONLY, - } - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_MDEUB | - DESC_HDR_MODE0_MDEUB_SHA512, +#define TALITOS_HASH_ALG_COMMON(name, digest_size, block_size, template, \ + set_key) \ + { \ + .type =3D CRYPTO_ALG_TYPE_AHASH, \ + .alg.hash =3D { \ + .init_tfm =3D talitos_cra_init_ahash, \ + .exit_tfm =3D talitos_cra_exit_ahash, \ + .init =3D ahash_init, \ + .update =3D ahash_update, \ + .final =3D ahash_final, \ + .finup =3D ahash_finup, \ + .digest =3D ahash_digest, \ + .setkey =3D set_key, \ + .import =3D ahash_import, \ + .export =3D ahash_export, \ + .halg.digestsize =3D digest_size, \ + .halg.statesize =3D sizeof(struct talitos_export_state), \ + .halg.base =3D { \ + .cra_name =3D name, \ + .cra_driver_name =3D name"-talitos", \ + .cra_blocksize =3D block_size, \ + .cra_reqsize =3D sizeof(struct talitos_ahash_req_ctx), \ + .cra_flags =3D CRYPTO_ALG_ASYNC | \ + CRYPTO_ALG_ALLOCATES_MEMORY | \ + CRYPTO_ALG_KERN_DRIVER_ONLY | \ + CRYPTO_AHASH_ALG_BLOCK_ONLY, \ + .cra_priority =3D TALITOS_CRA_PRIORITY, \ + .cra_ctxsize =3D sizeof(struct talitos_ctx), \ + .cra_module =3D THIS_MODULE, \ + }, \ + }, \ + .desc_hdr_template =3D template, \ } + +#define TALITOS_HASH_ALG(name, digest_size, block_size, desc_hdr_template)= \ + TALITOS_HASH_ALG_COMMON(name, digest_size, block_size, \ + desc_hdr_template, NULL) + +#define TALITOS_HMAC_HASH_ALG(name, digest_size, block_size, = \ + desc_hdr_template) \ + TALITOS_HASH_ALG_COMMON("hmac(" name ")", digest_size, block_size, \ + desc_hdr_template, ahash_setkey) + +static struct talitos_alg_template hash_driver_algs[] =3D { + TALITOS_HASH_ALG("md5", MD5_DIGEST_SIZE, MD5_HMAC_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | DESC_HDR_MODE0_MDEU_MD5), + + TALITOS_HASH_ALG("sha1", SHA1_DIGEST_SIZE, SHA1_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA1), + + TALITOS_HASH_ALG("sha224", SHA224_DIGEST_SIZE, SHA224_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA224), + + TALITOS_HASH_ALG("sha256", SHA256_DIGEST_SIZE, SHA256_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA256), + + TALITOS_HASH_ALG("sha384", SHA384_DIGEST_SIZE, SHA384_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUB | + DESC_HDR_MODE0_MDEUB_SHA384), + + TALITOS_HASH_ALG("sha512", SHA512_DIGEST_SIZE, SHA512_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUB | + DESC_HDR_MODE0_MDEUB_SHA512), + + /* HMAC */ + + TALITOS_HMAC_HASH_ALG("md5", MD5_DIGEST_SIZE, MD5_HMAC_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_MD5), + + TALITOS_HMAC_HASH_ALG("sha1", SHA1_DIGEST_SIZE, SHA1_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA1), + + TALITOS_HMAC_HASH_ALG("sha224", SHA224_DIGEST_SIZE, SHA224_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA224), + + TALITOS_HMAC_HASH_ALG("sha256", SHA256_DIGEST_SIZE, SHA256_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUA | + DESC_HDR_MODE0_MDEU_SHA256), + + TALITOS_HMAC_HASH_ALG("sha384", SHA384_DIGEST_SIZE, SHA384_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUB | + DESC_HDR_MODE0_MDEUB_SHA384), + + TALITOS_HMAC_HASH_ALG("sha512", SHA512_DIGEST_SIZE, SHA512_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_MDEUB | + DESC_HDR_MODE0_MDEUB_SHA512), }; =20 int talitos_register_hash(struct device *dev) @@ -790,18 +677,6 @@ int talitos_register_hash(struct device *dev) ahash_alg =3D &hash_driver_algs[i].alg.hash; alg =3D &ahash_alg->halg.base; =20 - ahash_alg->init_tfm =3D talitos_cra_init_ahash; - ahash_alg->exit_tfm =3D talitos_cra_exit_ahash; - ahash_alg->init =3D ahash_init; - ahash_alg->update =3D ahash_update; - ahash_alg->final =3D ahash_final; - ahash_alg->finup =3D ahash_finup; - ahash_alg->digest =3D ahash_digest; - if (!strncmp(alg->cra_name, "hmac", 4)) - ahash_alg->setkey =3D ahash_setkey; - ahash_alg->import =3D ahash_import; - ahash_alg->export =3D ahash_export; - if (!(priv->features & TALITOS_FTR_HMAC_OK) && !strncmp(alg->cra_name, "hmac", 4)) { /* not supported */ --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00F9D399CF2; Tue, 21 Jul 2026 14:00:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642403; cv=none; b=K6hizI1QbSyznw66F+pL6nI/9POa5FNuITzJI+RzRuPI5deTHveSJV4f1VeUc2oMYuW8Lzh6h+s5J8IuQ57dAAaajUmS2KpTtkbTRZ0+UpsZ/kk4XRXBWs5GIZIkYWhi4vxdFRq4s4K7zSMCtJYBZqJA9XDJBM+Bz6DdwYy0Fwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642403; c=relaxed/simple; bh=mXIa89rnqO/hfwJSkqBKeSHCffU6DMQLwzpd/0d37+4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HgwJxy9VotDsO1m/P59L8Ba5RF6VBq/s9XIm1MxxoNUSyTxr7OC903pAJ+8nkp/6zgUrl3UmsGxEgPJWiX1AY4ktM6LelbPZluVOLy+AlLyU0XExcmUPdg3Gx37fRLwnBTWKylJGP4tItyfef/09NuRxH39H3inJP6dAiih4Sro= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=CH+BKTy6; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="CH+BKTy6" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id A9BB04E40EA4; Tue, 21 Jul 2026 13:59:59 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 7E4AB60368; Tue, 21 Jul 2026 13:59:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 5083B11BD2635; Tue, 21 Jul 2026 15:59:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642398; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Wg1P3RqPZ7L5AELW1eFbAuTPco7L4Mda/oe5h4/hL44=; b=CH+BKTy6v/cTQdKNtNh+SiUCblRrWdu8wOOPeQYb/GMgXcnEb7OZMowY3Y645H3+D/bkv2 kXHdloZLMaE7hcmVwNUdQ893v/0z4jTzJHYAB50pz2mcHto6c3p/MDtr0FkWO0U4NY9Lai yJ7WZ80cm9BfD9vZvzWsHQj5EheBv4YSqkbXESj9EVLWfYxE5/OWRuVLiRDKfoeQo2hM2P oVmk36szrVkVC7ZajZqnA1ujTZyyFS+fJ+BuoQQdZPUocIDQXZEjQZND1hxl68rvqZJla/ V329mVD8H50ns5YaFg4aGQHDooNrZ/LgdUD5wQAR1ZA0zzQyOEQHB7avCJHVfw== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:40 +0200 Subject: [PATCH v3 13/19] crypto: talitos/skcipher - Use macro for algorithm definitions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-13-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=8918; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=mXIa89rnqO/hfwJSkqBKeSHCffU6DMQLwzpd/0d37+4=; b=cc6SkrrDJn0nL/VO/i+gjQyHDYTWxsjUFKv6AY1MHRboOeubERE7pt7Mp4S0X2MOI+XkpGbdQ 7uonF36o6d3C7/ZdFvAowwqg9F4Hkkpg+EvzfDmfhbRmVIWe0lP5NPk X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Replace the repetitive struct initializer entries with preprocessor macros. The fallback setkey assignment (skcipher_alg->setkey ?: skcipher_setkey) is no longer needed because each macro specifies the correct setkey handler directly. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos-skcipher.c | 212 ++++++++++++--------------= ---- 1 file changed, 82 insertions(+), 130 deletions(-) diff --git a/drivers/crypto/talitos/talitos-skcipher.c b/drivers/crypto/tal= itos/talitos-skcipher.c index 4c03573efb0a..b12191243aae 100644 --- a/drivers/crypto/talitos/talitos-skcipher.c +++ b/drivers/crypto/talitos/talitos-skcipher.c @@ -237,131 +237,89 @@ static void talitos_cra_exit_skcipher(struct crypto_= skcipher *tfm) talitos_cra_exit(crypto_skcipher_tfm(tfm)); } =20 +#define TALITOS_SKCIPHER_ALG_COMMON(name, blk_sz, iv_sz, min_ksz, max_ksz,= \ + set_key, desc_template) \ + { \ + .type =3D CRYPTO_ALG_TYPE_SKCIPHER, \ + .alg.skcipher =3D { \ + .base.cra_name =3D name, \ + .base.cra_driver_name =3D name"-talitos", \ + .base.cra_blocksize =3D blk_sz, \ + .base.cra_flags =3D CRYPTO_ALG_ASYNC | \ + CRYPTO_ALG_ALLOCATES_MEMORY | \ + CRYPTO_ALG_KERN_DRIVER_ONLY, \ + .base.cra_priority =3D TALITOS_CRA_PRIORITY, \ + .base.cra_ctxsize =3D sizeof(struct talitos_ctx), \ + .base.cra_module =3D THIS_MODULE, \ + .min_keysize =3D min_ksz, \ + .max_keysize =3D max_ksz, \ + .ivsize =3D iv_sz, \ + .setkey =3D set_key, \ + .init =3D talitos_cra_init_skcipher, \ + .exit =3D talitos_cra_exit_skcipher, \ + .encrypt =3D skcipher_encrypt, \ + .decrypt =3D skcipher_decrypt, \ + }, \ + .desc_hdr_template =3D desc_template, \ + } + +#define TALITOS_SKCIPHER_ALG_AES(name, blk_sz, iv_sz, desc_template) = \ + TALITOS_SKCIPHER_ALG_COMMON(name, blk_sz, iv_sz, AES_MIN_KEY_SIZE, \ + AES_MAX_KEY_SIZE, skcipher_aes_setkey, \ + desc_template) + +#define TALITOS_SKCIPHER_ALG_DES(name, blk_sz, iv_sz, desc_template) \ + TALITOS_SKCIPHER_ALG_COMMON(name, blk_sz, iv_sz, DES_KEY_SIZE, \ + DES_KEY_SIZE, skcipher_des_setkey, \ + desc_template) + +#define TALITOS_SKCIPHER_ALG_DES3(name, blk_sz, iv_sz, desc_template) = \ + TALITOS_SKCIPHER_ALG_COMMON(name, blk_sz, iv_sz, DES3_EDE_KEY_SIZE, \ + DES3_EDE_KEY_SIZE, skcipher_des3_setkey, \ + desc_template) + static struct talitos_alg_template skcipher_driver_algs[] =3D { - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ecb(aes)", - .base.cra_driver_name =3D "ecb-aes-talitos", - .base.cra_blocksize =3D AES_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D AES_MIN_KEY_SIZE, - .max_keysize =3D AES_MAX_KEY_SIZE, - .setkey =3D skcipher_aes_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "cbc(aes)", - .base.cra_driver_name =3D "cbc-aes-talitos", - .base.cra_blocksize =3D AES_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D AES_MIN_KEY_SIZE, - .max_keysize =3D AES_MAX_KEY_SIZE, - .ivsize =3D AES_BLOCK_SIZE, - .setkey =3D skcipher_aes_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ctr(aes)", - .base.cra_driver_name =3D "ctr-aes-talitos", - .base.cra_blocksize =3D 1, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D AES_MIN_KEY_SIZE, - .max_keysize =3D AES_MAX_KEY_SIZE, - .ivsize =3D AES_BLOCK_SIZE, - .setkey =3D skcipher_aes_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_AESU_CTR_NONSNOOP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CTR, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ctr(aes)", - .base.cra_driver_name =3D "ctr-aes-talitos", - .base.cra_blocksize =3D 1, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D AES_MIN_KEY_SIZE, - .max_keysize =3D AES_MAX_KEY_SIZE, - .ivsize =3D AES_BLOCK_SIZE, - .setkey =3D skcipher_aes_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CTR, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ecb(des)", - .base.cra_driver_name =3D "ecb-des-talitos", - .base.cra_blocksize =3D DES_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D DES_KEY_SIZE, - .max_keysize =3D DES_KEY_SIZE, - .setkey =3D skcipher_des_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "cbc(des)", - .base.cra_driver_name =3D "cbc-des-talitos", - .base.cra_blocksize =3D DES_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D DES_KEY_SIZE, - .max_keysize =3D DES_KEY_SIZE, - .ivsize =3D DES_BLOCK_SIZE, - .setkey =3D skcipher_des_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "ecb(des3_ede)", - .base.cra_driver_name =3D "ecb-3des-talitos", - .base.cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D DES3_EDE_KEY_SIZE, - .max_keysize =3D DES3_EDE_KEY_SIZE, - .setkey =3D skcipher_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_3DES, - }, - { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, - .alg.skcipher =3D { - .base.cra_name =3D "cbc(des3_ede)", - .base.cra_driver_name =3D "cbc-3des-talitos", - .base.cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .base.cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - .min_keysize =3D DES3_EDE_KEY_SIZE, - .max_keysize =3D DES3_EDE_KEY_SIZE, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .setkey =3D skcipher_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES, - }, + /* AES */ + + TALITOS_SKCIPHER_ALG_AES("ecb(aes)", AES_BLOCK_SIZE, 0, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU), + + TALITOS_SKCIPHER_ALG_AES("cbc(aes)", AES_BLOCK_SIZE, AES_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC), + + TALITOS_SKCIPHER_ALG_AES("ctr(aes)", 1, AES_BLOCK_SIZE, + DESC_HDR_TYPE_AESU_CTR_NONSNOOP | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CTR), + + TALITOS_SKCIPHER_ALG_AES("ctr(aes)", 1, AES_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CTR), + /* DES */ + + TALITOS_SKCIPHER_ALG_DES("ecb(des)", DES_BLOCK_SIZE, 0, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU), + + TALITOS_SKCIPHER_ALG_DES("cbc(des)", DES_BLOCK_SIZE, DES_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC), + /* DES3 */ + + TALITOS_SKCIPHER_ALG_DES3("ecb(des3_ede)", DES3_EDE_BLOCK_SIZE, 0, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_3DES), + + TALITOS_SKCIPHER_ALG_DES3( + "cbc(des3_ede)", DES3_EDE_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES), }; =20 int talitos_register_skcipher(struct device *dev) @@ -383,12 +341,6 @@ int talitos_register_skcipher(struct device *dev) if (has_ftr_sec1(priv)) alg->cra_alignmask =3D 3; =20 - skcipher_alg->init =3D talitos_cra_init_skcipher; - skcipher_alg->exit =3D talitos_cra_exit_skcipher; - skcipher_alg->setkey =3D skcipher_alg->setkey ?: skcipher_setkey; - skcipher_alg->encrypt =3D skcipher_encrypt; - skcipher_alg->decrypt =3D skcipher_decrypt; - if (!strcmp(alg->cra_name, "ctr(aes)") && !has_ftr_sec1(priv) && DESC_TYPE(skcipher_driver_algs[i].desc_hdr_template) !=3D DESC_TYPE(DESC_HDR_TYPE_AESU_CTR_NONSNOOP)) { --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D7F139B4AE; Tue, 21 Jul 2026 14:00:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642405; cv=none; b=NVzy9ei9R0e5/UhaTm9kPVY1o+xBXuI0T5Hl64gde9FQhDOVut+/2Ee5W1MfyopjAc4N1SThj4B0WBkqzA1rsYAaTkE7W4+SOtYP0ivpMR1pD4GLv5rCnUkvgA5VaXYdAd/f77RNYtjoqxpn5TecjKNp4zhbBsu6ME30ZrREyPc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642405; c=relaxed/simple; bh=qqLLj4KoJG6D8N0Jbdrrhwcva4ksz4o8Yfl1gYxeD7E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nFh0P76KgI2jbxqRnP76mDDAbM5I1P4MARTcXbQo4nbwI9FUNmTko6oIwjkna/QkMvYhygU9NODkVQbRdlx51UPMCOQVmArCuXj5tKAUIg30dnRzgGlnX/I9J/yE5lxeRrTWSHSEdSjDTN+lV2LVaT+hr9Sy+8eYFMrAalQxKqE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=wmVjIXIi; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="wmVjIXIi" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id BA41D4E40EA6; Tue, 21 Jul 2026 14:00:00 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 8EE2460368; Tue, 21 Jul 2026 14:00:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3A7F911BD3002; Tue, 21 Jul 2026 15:59:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642399; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=ONJSgG4NQ96s41PxkyUrFO+vQWnshxBftk5AF9g6FW8=; b=wmVjIXIivRAzCRVmUX1WEslEh6UlwrSuhAxnlBLdfnXRkyvvsX5lStdU36t/UyhZaZdsCf ks2OoKtAGRBDnqocBrMZvQB5s2TFAYglEpXde363ObhfSWeSzWE4boeGtat/dDVbEeicCO cai3DP2BA0MKmWIIurXad9GNZbYg+zrmy39ZcZVzNVoPmnPS1XrWQSp15jA0bcIF//6qjD viNrl81e8nh4LtG4FHu0bFSEm6v51DRMxM3WrMp45fsIQD2MzaQWpR07bY3/81E9phC/0A jLr3XDYe30zrS9wZ7tv2hq8yq5CElQY7sh3UUJYRGGv1CYmZmSnEZd3XKZ3U9A== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:41 +0200 Subject: [PATCH v3 14/19] crypto: talitos/aead - Use macro for algorithm definitions Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-14-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=24908; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=qqLLj4KoJG6D8N0Jbdrrhwcva4ksz4o8Yfl1gYxeD7E=; b=UQ5xExIESwcyhSECP+0eXTrD85Tc7z095JlfQ9K8pkOe5Qz6mG8sw9Zzt/NMfI2mwWSAJWCes h/safi6wJA4DVxBvGMwivTViOQFxaAvCHtPkjbJJreaUfV79Swt+gHV X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Replace the repetitive struct initializer entries with preprocessor macros. The fallback setkey assignment (aead_alg->setkey ?: aead_setkey) is replaced by specifying the correct setkey handler directly in each macro invocation. Reviewed-by: Christophe Leroy (CS GROUP) Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos-aead.c | 679 +++++++++++-------------------= ---- 1 file changed, 218 insertions(+), 461 deletions(-) diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c index 5537f2b6317f..cd1b8e6d371b 100644 --- a/drivers/crypto/talitos/talitos-aead.c +++ b/drivers/crypto/talitos/talitos-aead.c @@ -405,463 +405,225 @@ static void talitos_cra_exit_aead(struct crypto_aea= d *tfm) talitos_cra_exit(crypto_aead_tfm(tfm)); } =20 +#define TALITOS_AEAD_ALG_COMMON(name, name_prefix, set_key, block_size, \ + max_auth_size, template, priority) \ + { \ + .type =3D CRYPTO_ALG_TYPE_AEAD, \ + .alg.aead =3D { \ + .base =3D { \ + .cra_name =3D name, \ + .cra_driver_name =3D name"-talitos"name_prefix, \ + .cra_blocksize =3D block_size, \ + .cra_flags =3D CRYPTO_ALG_ASYNC | \ + CRYPTO_ALG_ALLOCATES_MEMORY | \ + CRYPTO_ALG_KERN_DRIVER_ONLY, \ + .cra_priority =3D (priority), \ + .cra_ctxsize =3D sizeof(struct talitos_ctx), \ + .cra_module =3D THIS_MODULE, \ + }, \ + .ivsize =3D block_size, \ + .maxauthsize =3D max_auth_size, \ + .setkey =3D set_key, \ + .init =3D talitos_cra_init_aead, \ + .exit =3D talitos_cra_exit_aead, \ + .encrypt =3D aead_encrypt, \ + .decrypt =3D aead_decrypt, \ + }, \ + .desc_hdr_template =3D template, \ + } + +#define TALITOS_AEAD_ALG(name, set_key, block_size, max_auth_size, templat= e) \ + TALITOS_AEAD_ALG_COMMON(name, "", set_key, block_size, max_auth_size, \ + template, TALITOS_CRA_PRIORITY) + +#define TALITOS_AEAD_ALG_HSNA(name, set_key, block_size, max_auth_size, \ + template) \ + TALITOS_AEAD_ALG_COMMON(name, "-hsna", set_key, block_size, \ + max_auth_size, template, \ + TALITOS_CRA_PRIORITY_AEAD_HSNA) + static struct talitos_alg_template aead_driver_algs[] =3D { - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha1),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha1-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA1_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA1_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha1),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha1-" - "cbc-aes-talitos-hsna", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA1_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA1_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha1)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha1-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA1_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA1_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha1)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha1-" - "cbc-3des-talitos-hsna", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA1_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA1_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha224),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha224-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA224_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA224_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha224),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha224-" - "cbc-aes-talitos-hsna", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA224_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA224_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha224)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha224-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA224_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA224_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha224)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha224-" - "cbc-3des-talitos-hsna", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA224_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA224_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha256),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha256-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA256_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA256_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha256),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha256-" - "cbc-aes-talitos-hsna", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA256_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA256_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha256)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha256-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA256_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA256_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha256)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha256-" - "cbc-3des-talitos-hsna", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA256_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_SHA256_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha384),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha384-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA384_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUB | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEUB_SHA384_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha384)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha384-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA384_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUB | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEUB_SHA384_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha512),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-sha512-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D SHA512_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUB | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEUB_SHA512_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(sha512)," - "cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-sha512-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D SHA512_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUB | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEUB_SHA512_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(md5),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-md5-" - "cbc-aes-talitos", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D MD5_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_MD5_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(md5),cbc(aes))", - .cra_driver_name =3D "authenc-hmac-md5-" - "cbc-aes-talitos-hsna", - .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D AES_BLOCK_SIZE, - .maxauthsize =3D MD5_DIGEST_SIZE, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_AESU | - DESC_HDR_MODE0_AESU_CBC | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_MD5_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(md5),cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-md5-" - "cbc-3des-talitos", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D MD5_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_IPSEC_ESP | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_MD5_HMAC, - }, - { .type =3D CRYPTO_ALG_TYPE_AEAD, - .priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .alg.aead =3D { - .base =3D { - .cra_name =3D "authenc(hmac(md5),cbc(des3_ede))", - .cra_driver_name =3D "authenc-hmac-md5-" - "cbc-3des-talitos-hsna", - .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | - CRYPTO_ALG_ALLOCATES_MEMORY, - }, - .ivsize =3D DES3_EDE_BLOCK_SIZE, - .maxauthsize =3D MD5_DIGEST_SIZE, - .setkey =3D aead_des3_setkey, - }, - .desc_hdr_template =3D DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | - DESC_HDR_SEL0_DEU | - DESC_HDR_MODE0_DEU_CBC | - DESC_HDR_MODE0_DEU_3DES | - DESC_HDR_SEL1_MDEUA | - DESC_HDR_MODE1_MDEU_INIT | - DESC_HDR_MODE1_MDEU_PAD | - DESC_HDR_MODE1_MDEU_MD5_HMAC, - }, + /* AEAD algorithms. These use a single-pass ipsec_esp descriptor */ + + /* sha1 auth */ + + TALITOS_AEAD_ALG("authenc(hmac(sha1),cbc(aes))", aead_setkey, + AES_BLOCK_SIZE, SHA1_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA1_HMAC), + + TALITOS_AEAD_ALG_HSNA( + "authenc(hmac(sha1),cbc(aes))", aead_setkey, AES_BLOCK_SIZE, + SHA1_DIGEST_SIZE, + DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA1_HMAC), + + TALITOS_AEAD_ALG("authenc(hmac(sha1),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, SHA1_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | + DESC_HDR_MODE0_DEU_3DES | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA1_HMAC), + + TALITOS_AEAD_ALG_HSNA( + "authenc(hmac(sha1),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, SHA1_DIGEST_SIZE, + DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA1_HMAC), + + /* sha224 auth */ + + TALITOS_AEAD_ALG("authenc(hmac(sha224),cbc(aes))", aead_setkey, + AES_BLOCK_SIZE, SHA224_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA224_HMAC), + + TALITOS_AEAD_ALG_HSNA( + "authenc(hmac(sha224),cbc(aes))", aead_setkey, AES_BLOCK_SIZE, + SHA224_DIGEST_SIZE, + DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA224_HMAC), + + TALITOS_AEAD_ALG( + "authenc(hmac(sha224),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, SHA224_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA224_HMAC), + + TALITOS_AEAD_ALG_HSNA( + "authenc(hmac(sha224),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, SHA224_DIGEST_SIZE, + DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA224_HMAC), + + /* sha256 auth */ + + TALITOS_AEAD_ALG("authenc(hmac(sha256),cbc(aes))", aead_setkey, + AES_BLOCK_SIZE, SHA256_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA256_HMAC), + + TALITOS_AEAD_ALG_HSNA( + "authenc(hmac(sha256),cbc(aes))", aead_setkey, AES_BLOCK_SIZE, + SHA256_DIGEST_SIZE, + DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA256_HMAC), + + TALITOS_AEAD_ALG( + "authenc(hmac(sha256),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, SHA256_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA256_HMAC), + + TALITOS_AEAD_ALG_HSNA( + "authenc(hmac(sha256),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, SHA256_DIGEST_SIZE, + DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_SHA256_HMAC), + + /* sha384 auth */ + + TALITOS_AEAD_ALG("authenc(hmac(sha384),cbc(aes))", aead_setkey, + AES_BLOCK_SIZE, SHA384_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUB | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEUB_SHA384_HMAC), + + TALITOS_AEAD_ALG( + "authenc(hmac(sha384),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, SHA384_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUB | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEUB_SHA384_HMAC), + + /* sha512 auth */ + + TALITOS_AEAD_ALG("authenc(hmac(sha512),cbc(aes))", aead_setkey, + AES_BLOCK_SIZE, SHA512_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUB | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEUB_SHA512_HMAC), + + TALITOS_AEAD_ALG( + "authenc(hmac(sha512),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, SHA512_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUB | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEUB_SHA512_HMAC), + + /* md5 auth */ + + TALITOS_AEAD_ALG("authenc(hmac(md5),cbc(aes))", aead_setkey, + AES_BLOCK_SIZE, MD5_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_MD5_HMAC), + + TALITOS_AEAD_ALG_HSNA( + "authenc(hmac(md5),cbc(aes))", aead_setkey, AES_BLOCK_SIZE, + MD5_DIGEST_SIZE, + DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | DESC_HDR_SEL0_AESU | + DESC_HDR_MODE0_AESU_CBC | DESC_HDR_SEL1_MDEUA | + DESC_HDR_MODE1_MDEU_INIT | DESC_HDR_MODE1_MDEU_PAD | + DESC_HDR_MODE1_MDEU_MD5_HMAC), + + TALITOS_AEAD_ALG( + "authenc(hmac(md5),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, MD5_DIGEST_SIZE, + DESC_HDR_TYPE_IPSEC_ESP | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | DESC_HDR_MODE1_MDEU_MD5_HMAC), + + TALITOS_AEAD_ALG_HSNA( + "authenc(hmac(md5),cbc(des3_ede))", aead_des3_setkey, + DES3_EDE_BLOCK_SIZE, MD5_DIGEST_SIZE, + DESC_HDR_TYPE_HMAC_SNOOP_NO_AFEU | DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_CBC | DESC_HDR_MODE0_DEU_3DES | + DESC_HDR_SEL1_MDEUA | DESC_HDR_MODE1_MDEU_INIT | + DESC_HDR_MODE1_MDEU_PAD | DESC_HDR_MODE1_MDEU_MD5_HMAC), }; =20 int talitos_register_aead(struct device *dev) @@ -883,11 +645,6 @@ int talitos_register_aead(struct device *dev) if (has_ftr_sec1(priv)) alg->cra_alignmask =3D 3; =20 - aead_alg->init =3D talitos_cra_init_aead; - aead_alg->exit =3D talitos_cra_exit_aead; - aead_alg->setkey =3D aead_alg->setkey ?: aead_setkey; - aead_alg->encrypt =3D aead_encrypt; - aead_alg->decrypt =3D aead_decrypt; if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) && !strncmp(alg->cra_name, "authenc(hmac(sha224)", 20)) { continue; --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B97539E6FC; Tue, 21 Jul 2026 14:00:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642406; cv=none; b=VS/mAlQfnC/Y9Or6M8pgmD9r2RX8lgmwN0huqzSAFG00XkNOlrnJKHVXGdjbz1pNPfVN1ZdPt8cR7nHS+mtWkrvDcVn7OoXuUkWu7gKf4rUfhRYqETZv76UeWb0kpyiUKAOKopg1e+wDJDQnJlQIZQeWzrHlf/YUHk+rxfUNKYs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642406; c=relaxed/simple; bh=yBIuQihIVgq8eemqwo2V4kfBsvv+fb+FArKsclDIDMo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rctKkEDBkRU249ftBGs1n3/tQ/3vsCnYHIuYkgYoV+RY+RZY0UUDK/JZDan5OLx0WxFD6OKeMWZwOi98NCjaFuxTq6T1Hsxzx5U3q++3HBlQxbIRu6v8dszVSqQRigdUGgIa3aHdzvzuyAw21HH4o4BdkBbYBBChQI7YSGfnsAY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=KlEki36i; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="KlEki36i" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id DCD241A113A; Tue, 21 Jul 2026 14:00:02 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id A160360368; Tue, 21 Jul 2026 14:00:02 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 492A111BD3A55; Tue, 21 Jul 2026 16:00:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642401; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=ITPtmaCUeyEjw45SNx2etD9e/MRBG2mYsowxgE/yfQQ=; b=KlEki36iYM/E4cZhaoiH50HO7wrCT2EagtZ11SNn9e1CMHcutaV8UEhzzM2v7dCIRqGblh bEsaAWjdxihGCX92NlD/y1TFMqqe67mnu3nu/23Xpg65euU9bSawqqrAtZbWyKsCMdc5DO a0c4CubVP9m3jIt2Hb6iwsk4pa+w9ZYRDgkbomsc8rHmLT8pnit8jHZyuzRRgQbk9rqL9g YOchDB1FmpJJk0ZG5OI2pFgslwws83j2C/6uPCEC67T9731HYay+GBNvv+kuux9VkVJ5zP Xg7/jkeWIr2M2fMp9jAPHSoTIYdJB/k0rtr44BKmBvSIR+/q9snSHJibKn/Uug== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:42 +0200 Subject: [PATCH v3 15/19] crypto: talitos - Remove alg settings in talitos_register_common() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-15-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=2530; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=yBIuQihIVgq8eemqwo2V4kfBsvv+fb+FArKsclDIDMo=; b=ThJklSEPcbS4k53La3aB2Q/Q7VrSjWjCj+juQRGaHrXP6pnUT6w0gAfHQdHIuv6vpT9xc8pus EMg+gkRIlXsDSOcaMuCV6fhq168Xm+AE9bvKNW/7mQRnZGWBC6LOQJi X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Algorithm properties are now set at compile time for those who are not dependent on runtime features. Remove now-unused function and struct member. Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos.c | 23 ----------------------- drivers/crypto/talitos/talitos.h | 1 - 2 files changed, 24 deletions(-) diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 52ff5ef46fb6..ff938cc4e837 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -1040,23 +1040,6 @@ static void talitos_remove(struct platform_device *o= fdev) tasklet_kill(&priv->done_task[1]); } =20 -static void talitos_alg_set_common(struct talitos_private *priv, - struct crypto_alg *alg, u32 custom_priority, - u32 type) -{ - alg->cra_module =3D THIS_MODULE; - if (custom_priority) - alg->cra_priority =3D custom_priority; - else - alg->cra_priority =3D TALITOS_CRA_PRIORITY; - if (has_ftr_sec1(priv) && type !=3D CRYPTO_ALG_TYPE_AHASH) - alg->cra_alignmask =3D 3; - else - alg->cra_alignmask =3D 0; - alg->cra_ctxsize =3D sizeof(struct talitos_ctx); - alg->cra_flags |=3D CRYPTO_ALG_KERN_DRIVER_ONLY; -} - int talitos_register_common(struct device *dev, struct talitos_alg_template *template) { @@ -1075,20 +1058,14 @@ int talitos_register_common(struct device *dev, switch (t_alg->algt.type) { case CRYPTO_ALG_TYPE_AHASH: alg =3D &t_alg->algt.alg.hash.halg.base; - talitos_alg_set_common(priv, alg, t_alg->algt.priority, - t_alg->algt.type); ret =3D crypto_register_ahash(&t_alg->algt.alg.hash); break; case CRYPTO_ALG_TYPE_SKCIPHER: alg =3D &t_alg->algt.alg.skcipher.base; - talitos_alg_set_common(priv, alg, t_alg->algt.priority, - t_alg->algt.type); ret =3D crypto_register_skcipher(&t_alg->algt.alg.skcipher); break; case CRYPTO_ALG_TYPE_AEAD: alg =3D &t_alg->algt.alg.aead.base; - talitos_alg_set_common(priv, alg, t_alg->algt.priority, - t_alg->algt.type); ret =3D crypto_register_aead(&t_alg->algt.alg.aead); break; default: diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index e36a2609d87d..3cbce0be705d 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -203,7 +203,6 @@ struct talitos_ctx { =20 struct talitos_alg_template { u32 type; - u32 priority; union { struct skcipher_alg skcipher; struct ahash_alg hash; --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDA1739EF0F for ; Tue, 21 Jul 2026 14:00:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642406; cv=none; b=UL/Yjp+zY2iMnRvii1bOajaWZv5DiDIeXKq89eFkqpbdFdBQzkNVs+f+Vh8RVOsW2NASExJfjjy7Hdylyan62z75/fkTogirod+HKetaNjeoT179Fra5JxvLoeQJGgwNzqXz/SztCQFw3ILq2T7Ky1Wd3Up4PoACS9Hp6bz87Io= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642406; c=relaxed/simple; bh=sD5NmdmsXmzVoSiMz6gOTQdaBlya6OoP+fmUbgnCDPs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aEAnw19yMjeu3FR05sAW0d0TjX6B21TXCFQtcaytc0ytpmGzG4IdqrTvKVRrsGP0lvw04Bj6RAQ2En+UcLr8at6woCX3uke5qwTZyVgGJLOTcC6Td1sA3ehPBO2iKRuG+KH8PxQYDPjj4nGkmeIsp63gNQtefqWMcxyy5my+33g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=DJOIaXvA; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="DJOIaXvA" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 11F844E40EA7; Tue, 21 Jul 2026 14:00:03 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id CD4CE60373; Tue, 21 Jul 2026 14:00:02 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 5A8E011BD3B76; Tue, 21 Jul 2026 16:00:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642402; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=IJzkhZHadDbXIMbPJMOXNyPk9VmgtEsFGR9aeClYE80=; b=DJOIaXvA1II77rzBm/ySBoVdAkvSlIAAXC6iLT8zDkqsEwjezZuAt0u+cN0zu229RFkwgg NdhAPyr7p3LTPg3ngPmSiN99DVKXnmSCS3o06As2KiSAQyprW42XiIRcV6zpran3a7iozF KdGtWTIScIKWasB8VbPV1kz/meS/lLxeIMjv22wxWmFJKpsoXAEDV2R2dPv5xxtW4QfgjV o9EsSX6jP8kMNQNOs9C2OArt2oOmdYAEL62SUmknhPm6PI1QX3McZ0uao7LkWjdXO8zQbC +Ok/LUUGLZw7HqvePFQKwgjd2fdK3ZyBwcmqPzJGpBiViCmiPLCOCyDO6WLV8Q== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:43 +0200 Subject: [PATCH v3 16/19] crypto: talitos - Introduce is_sec1() helper with static key support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-16-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=2752; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=sD5NmdmsXmzVoSiMz6gOTQdaBlya6OoP+fmUbgnCDPs=; b=9sj5iu1a82mP/r4i+y8kxZQaMaQ0atL3VVZKzq4h0lfQI1mbHrKwB6YffjIfjEITMYgTnKMmF RrBJQzTx4hhCgQPpZanE+TZiN/DPMnvdTtQDAI/SrM379cP27KEi+5K X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 In preparation for per-SEC-version code paths, introduce an is_sec1() inline helper that abstracts the SEC version check behind a static key. The goal is to remove all bool is_sec1 parameters from the call chain via the is_sec1() helper. Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos.c | 10 +++++++++- drivers/crypto/talitos/talitos.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index ff938cc4e837..c93e3b551f6d 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -1196,8 +1196,12 @@ static int talitos_probe(struct platform_device *ofd= ev) TALITOS_FTR_SHA224_HWINIT | TALITOS_FTR_HMAC_OK; =20 - if (of_device_is_compatible(np, "fsl,sec1.0")) + if (of_device_is_compatible(np, "fsl,sec1.0")) { priv->features |=3D TALITOS_FTR_SEC1; + talitos_init_branch(true); + } else { + talitos_init_branch(false); + } =20 if (of_device_is_compatible(np, "fsl,sec1.2")) { priv->reg_deu =3D priv->reg + TALITOS12_DEU; @@ -1317,6 +1321,10 @@ static int talitos_probe(struct platform_device *ofd= ev) return err; } =20 +#if defined(CONFIG_CRYPTO_DEV_TALITOS1) && defined(CONFIG_CRYPTO_DEV_TALIT= OS2) +DEFINE_STATIC_KEY_FALSE(talitos_is_sec1); +#endif + static const struct of_device_id talitos_match[] =3D { #ifdef CONFIG_CRYPTO_DEV_TALITOS1 { diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index 3cbce0be705d..b0d176c7dab2 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -14,6 +14,7 @@ #include #include #include +#include #include #include =20 @@ -224,6 +225,33 @@ struct talitos_crypto_alg { #define TALITOS_FTR_HMAC_OK 0x00000008 #define TALITOS_FTR_SEC1 0x00000010 =20 +#if defined(CONFIG_CRYPTO_DEV_TALITOS1) && defined(CONFIG_CRYPTO_DEV_TALIT= OS2) +DECLARE_STATIC_KEY_FALSE(talitos_is_sec1); + +static __always_inline bool is_sec1(void) +{ + return static_branch_unlikely(&talitos_is_sec1); +} + +static inline void talitos_init_branch(bool sec1) +{ + if (sec1) + static_branch_enable(&talitos_is_sec1); +} + +#else + +static __always_inline bool is_sec1(void) +{ + return IS_ENABLED(CONFIG_CRYPTO_DEV_TALITOS1); +} + +static inline void talitos_init_branch(bool sec1) +{ +} + +#endif + /* * If both CONFIG_CRYPTO_DEV_TALITOS1 and CONFIG_CRYPTO_DEV_TALITOS2 are * defined, we check the features which are set according to the device tr= ee. --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 844F539F19F for ; Tue, 21 Jul 2026 14:00:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642411; cv=none; b=nghlcLsQKur/KWIqe9RyZOOS7AwEUbtHgMUl/XXo0OQuoERisG27MMG3YU6uNj4L6x+IUdTXGzKcJ1zmsHdyVKLKT0d0qI7jm89I3AIZw3pWKxtXVTtSvxGziD8gB3fZ7Cl6/+ekrmjiBap6sLWa4LzIgE5FbnLmlFsxNWGL0yE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642411; c=relaxed/simple; bh=MS22pgai3VocF2kDhES3V/HEtmGLihIxFPHgVsjcM5A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=llx8mNJhyqm3QchSvDEg2RYgG5X1H1vl91maSRKvxSfndRBZC4VsW+Qc0OuqxfASXxF/0blp03EJPvVOQaEToyKTudKbOBk8jQj5h731/XN2W7eenMzvL5aK3g6zPeLrv8rZCdug+lxr78r5TmjPu2rWsNRma0hi9dqr+w8HAC4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=KwzkdOz0; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="KwzkdOz0" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id ECC604E40EA4; Tue, 21 Jul 2026 14:00:03 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id BAC4960368; Tue, 21 Jul 2026 14:00:03 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 5B9E011BD3B79; Tue, 21 Jul 2026 16:00:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642403; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=u/x/5JD+6l0Gve2STkuFjGGhK9kFHew6GxHTRK04M4A=; b=KwzkdOz0l4M0VZlDMkJya2YJ2CmReLnidlwMqNJEF2SZINPduN77CO7beqy6+pNFYT/nts cJpc4XHT9HcNjOc0y8oJXZ2ZqfdDnoGsw1mEyPoGQTtpmp49w2S3srnPF61fBMIo/Q708T qWO+eFMx4TI05o3TRChsbio5olKoKvUXsCsPTJLHn5gbith6XRlvo+Tw+g+Zhvtta4hFUv Rxd99Z5MAIvL+kzAtIbZO+FulLufwDQKjX+duyWDGLI+IVa8gnnoJU9Syq+nmaPR60aQGZ Makd5R4H6auByr8/+hZ1MEQpnqtdq5VkUsmmA7w0k3RUV/CuiqOjHmUBRc2R/A== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:44 +0200 Subject: [PATCH v3 17/19] crypto: talitos - Replace has_ftr_sec1() with is_sec1() static key helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-17-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=28945; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=MS22pgai3VocF2kDhES3V/HEtmGLihIxFPHgVsjcM5A=; b=lEDYxAt1xlS2wj7FcbqlBGhBIpPoLxjfCEoZ9VCC0c6CmU7vkvGwsoNxgJ5Kzx07WQbhpnSUr wG/b83GQpS9Bxh4Q5JPsTVBV/kZMikaJO1ljHWT+f0bzA+ho00P/kej X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Now that is_sec1() is available, replace all has_ftr_sec1(priv) calls and the local "bool is_sec1" variables with direct is_sec1() invocations. It removes the requirement that every caller has to either get struct talitos_private out of dev_get_drvdata() or/and pass the is_sec1 parameter to each inline helper. Drop the now-unused has_ftr_sec1() helper. Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos-aead.c | 24 +++---- drivers/crypto/talitos/talitos-hash.c | 26 +++---- drivers/crypto/talitos/talitos-skcipher.c | 15 ++-- drivers/crypto/talitos/talitos.c | 113 +++++++++++++-------------= ---- drivers/crypto/talitos/talitos.h | 49 ++++--------- 5 files changed, 87 insertions(+), 140 deletions(-) diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c index cd1b8e6d371b..d9e27eddfd1d 100644 --- a/drivers/crypto/talitos/talitos-aead.c +++ b/drivers/crypto/talitos/talitos-aead.c @@ -208,18 +208,16 @@ static int ipsec_esp(struct talitos_edesc *edesc, str= uct aead_request *areq, int sg_count, ret; int elen =3D 0; bool sync_needed =3D false; - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); bool is_ipsec_esp =3D desc->hdr & DESC_HDR_TYPE_IPSEC_ESP; struct talitos_ptr *civ_ptr =3D &desc->ptr[is_ipsec_esp ? 2 : 3]; struct talitos_ptr *ckey_ptr =3D &desc->ptr[is_ipsec_esp ? 3 : 2]; dma_addr_t dma_icv =3D edesc->dma_link_tbl + edesc->dma_len - authsize; =20 /* hmac key */ - to_talitos_ptr(&desc->ptr[0], ctx->dma_key, ctx->authkeylen, is_sec1); + to_talitos_ptr(&desc->ptr[0], ctx->dma_key, ctx->authkeylen); =20 sg_count =3D edesc->src_nents ?: 1; - if (is_sec1 && sg_count > 1) + if (is_sec1() && sg_count > 1) sg_copy_to_buffer(areq->src, sg_count, edesc->buf, areq->assoclen + cryptlen); else @@ -237,11 +235,11 @@ static int ipsec_esp(struct talitos_edesc *edesc, str= uct aead_request *areq, } =20 /* cipher iv */ - to_talitos_ptr(civ_ptr, edesc->iv_dma, ivsize, is_sec1); + to_talitos_ptr(civ_ptr, edesc->iv_dma, ivsize); =20 /* cipher key */ to_talitos_ptr(ckey_ptr, ctx->dma_key + ctx->authkeylen, - ctx->enckeylen, is_sec1); + ctx->enckeylen); =20 /* * cipher in @@ -264,7 +262,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struc= t aead_request *areq, /* cipher out */ if (areq->src !=3D areq->dst) { sg_count =3D edesc->dst_nents ? : 1; - if (!is_sec1 || sg_count =3D=3D 1) + if (!is_sec1() || sg_count =3D=3D 1) dma_map_sg(dev, areq->dst, sg_count, DMA_FROM_DEVICE); } =20 @@ -281,15 +279,15 @@ static int ipsec_esp(struct talitos_edesc *edesc, str= uct aead_request *areq, struct talitos_ptr *tbl_ptr =3D &edesc->link_tbl[tbl_off]; =20 /* Add an entry to the link table for ICV data */ - to_talitos_ptr_ext_set(tbl_ptr - 1, 0, is_sec1); - to_talitos_ptr_ext_set(tbl_ptr, DESC_PTR_LNKTBL_RET, is_sec1); + to_talitos_ptr_ext_set(tbl_ptr - 1, 0); + to_talitos_ptr_ext_set(tbl_ptr, DESC_PTR_LNKTBL_RET); =20 /* icv data follows link tables */ - to_talitos_ptr(tbl_ptr, dma_icv, authsize, is_sec1); - to_talitos_ptr_ext_or(&desc->ptr[5], authsize, is_sec1); + to_talitos_ptr(tbl_ptr, dma_icv, authsize); + to_talitos_ptr_ext_or(&desc->ptr[5], authsize); sync_needed =3D true; } else if (!encrypt) { - to_talitos_ptr(&desc->ptr[6], dma_icv, authsize, is_sec1); + to_talitos_ptr(&desc->ptr[6], dma_icv, authsize); sync_needed =3D true; } else if (!is_ipsec_esp) { talitos_sg_map(dev, areq->dst, authsize, edesc, &desc->ptr[6], @@ -642,7 +640,7 @@ int talitos_register_aead(struct device *dev) aead_alg =3D &aead_driver_algs[i].alg.aead; alg =3D &aead_alg->base; =20 - if (has_ftr_sec1(priv)) + if (is_sec1()) alg->cra_alignmask =3D 3; =20 if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) && diff --git a/drivers/crypto/talitos/talitos-hash.c b/drivers/crypto/talitos= /talitos-hash.c index f90018d4e219..c7a1a622c014 100644 --- a/drivers/crypto/talitos/talitos-hash.c +++ b/drivers/crypto/talitos/talitos-hash.c @@ -44,8 +44,6 @@ static void common_nonsnoop_hash_unmap(struct device *dev, { struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); struct talitos_desc *desc =3D &edesc->desc; =20 unmap_single_talitos_ptr(dev, &desc->ptr[5], DMA_FROM_DEVICE); @@ -58,7 +56,7 @@ static void common_nonsnoop_hash_unmap(struct device *dev, talitos_sg_unmap(dev, edesc, edesc->src, NULL, 0, 0); =20 /* When using hashctx-in, must unmap it. */ - if (from_talitos_ptr_len(&desc->ptr[1], is_sec1)) + if (from_talitos_ptr_len(&desc->ptr[1])) unmap_single_talitos_ptr(dev, &desc->ptr[1], DMA_TO_DEVICE); =20 @@ -89,11 +87,10 @@ static void ahash_done(struct device *dev, container_of(desc, struct talitos_edesc, desc); struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); - bool is_sec1 =3D has_ftr_sec1(dev_get_drvdata(dev)); struct talitos_ctx *ctx =3D crypto_ahash_ctx(tfm); struct talitos_edesc *next; =20 - if (is_sec1) { + if (is_sec1()) { free_edesc_list_from(areq, edesc); ahash_request_complete(areq, err ?: req_ctx->to_hash_later); } else { @@ -150,8 +147,6 @@ static void common_nonsnoop_hash(struct talitos_edesc *= edesc, struct device *dev =3D ctx->dev; struct talitos_desc *desc =3D &edesc->desc; bool sync_needed =3D false; - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); int sg_count; =20 /* first DWORD empty */ @@ -169,11 +164,10 @@ static void common_nonsnoop_hash(struct talitos_edesc= *edesc, =20 /* HMAC key */ if (ctx->keylen) - to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen, - is_sec1); + to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen); =20 sg_count =3D edesc->src_nents ?: 1; - if (is_sec1 && sg_count > 1) + if (is_sec1() && sg_count > 1) sg_copy_to_buffer(edesc->src, sg_count, edesc->buf, length); else if (length) sg_count =3D dma_map_sg(dev, edesc->src, sg_count, DMA_TO_DEVICE); @@ -201,7 +195,7 @@ static void common_nonsnoop_hash(struct talitos_edesc *= edesc, =20 /* last DWORD empty */ =20 - if (is_sec1 && from_talitos_ptr_len(&desc->ptr[3], true) =3D=3D 0) + if (is_sec1() && from_talitos_ptr_len(&desc->ptr[3]) =3D=3D 0) talitos_handle_buggy_hash(req_ctx, ctx, edesc, &desc->ptr[3]); =20 if (sync_needed) @@ -222,12 +216,12 @@ static struct talitos_edesc *ahash_edesc_alloc(struct= ahash_request *areq, =20 static struct talitos_edesc * ahash_process_req_prepare(struct ahash_request *areq, unsigned int nbytes, - unsigned int blocksize, bool is_sec1) + unsigned int blocksize) { struct talitos_ctx *ctx =3D crypto_ahash_ctx(crypto_ahash_reqtfm(areq)); struct talitos_ahash_req_ctx *req_ctx =3D ahash_request_ctx(areq); struct talitos_edesc *first =3D NULL, *prev_edesc =3D NULL, *edesc; - size_t desc_max =3D is_sec1 ? TALITOS1_MAX_DATA_LEN : + size_t desc_max =3D is_sec1() ? TALITOS1_MAX_DATA_LEN : TALITOS2_MAX_DATA_LEN; struct scatterlist tmp[2]; size_t to_hash_this_desc; @@ -272,7 +266,7 @@ ahash_process_req_prepare(struct ahash_request *areq, u= nsigned int nbytes, edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_HMAC; =20 /* clear the DN bit */ - if (is_sec1 && !edesc->last) + if (is_sec1() && !edesc->last) edesc->desc.hdr &=3D ~DESC_HDR_DONE_NOTIFY; =20 common_nonsnoop_hash(edesc, areq, to_hash_this_desc); @@ -298,7 +292,6 @@ static int ahash_process_req(struct ahash_request *areq= , unsigned int nbytes) struct talitos_edesc *edesc; unsigned int blocksize =3D crypto_tfm_alg_blocksize(crypto_ahash_tfm(tfm)); - bool is_sec1 =3D has_ftr_sec1(dev_get_drvdata(ctx->dev)); unsigned int nbytes_to_hash; unsigned int to_hash_later; struct device *dev =3D ctx->dev; @@ -314,8 +307,7 @@ static int ahash_process_req(struct ahash_request *areq= , unsigned int nbytes) =20 req_ctx->to_hash_later =3D to_hash_later; =20 - edesc =3D ahash_process_req_prepare(areq, nbytes_to_hash, blocksize, - is_sec1); + edesc =3D ahash_process_req_prepare(areq, nbytes_to_hash, blocksize); if (IS_ERR(edesc)) return PTR_ERR(edesc); =20 diff --git a/drivers/crypto/talitos/talitos-skcipher.c b/drivers/crypto/tal= itos/talitos-skcipher.c index b12191243aae..2c34e2ffbf7e 100644 --- a/drivers/crypto/talitos/talitos-skcipher.c +++ b/drivers/crypto/talitos/talitos-skcipher.c @@ -59,21 +59,19 @@ static int common_nonsnoop(struct talitos_edesc *edesc, unsigned int ivsize =3D crypto_skcipher_ivsize(cipher); int sg_count, ret; bool sync_needed =3D false; - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); bool is_ctr =3D (desc->hdr & DESC_HDR_SEL0_MASK) =3D=3D DESC_HDR_SEL0_AES= U && (desc->hdr & DESC_HDR_MODE0_AESU_MASK) =3D=3D DESC_HDR_MODE0_AESU_= CTR; =20 /* first DWORD empty */ =20 /* cipher iv */ - to_talitos_ptr(&desc->ptr[1], edesc->iv_dma, ivsize, is_sec1); + to_talitos_ptr(&desc->ptr[1], edesc->iv_dma, ivsize); =20 /* cipher key */ - to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen, is_sec1); + to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen); =20 sg_count =3D edesc->src_nents ?: 1; - if (is_sec1 && sg_count > 1) + if (is_sec1() && sg_count > 1) sg_copy_to_buffer(areq->src, sg_count, edesc->buf, cryptlen); else @@ -91,7 +89,7 @@ static int common_nonsnoop(struct talitos_edesc *edesc, /* cipher out */ if (areq->src !=3D areq->dst) { sg_count =3D edesc->dst_nents ? : 1; - if (!is_sec1 || sg_count =3D=3D 1) + if (!is_sec1() || sg_count =3D=3D 1) dma_map_sg(dev, areq->dst, sg_count, DMA_FROM_DEVICE); } =20 @@ -324,7 +322,6 @@ static struct talitos_alg_template skcipher_driver_algs= [] =3D { =20 int talitos_register_skcipher(struct device *dev) { - struct talitos_private *priv =3D dev_get_drvdata(dev); struct skcipher_alg *skcipher_alg; struct crypto_alg *alg; size_t i; @@ -338,10 +335,10 @@ int talitos_register_skcipher(struct device *dev) skcipher_alg =3D &skcipher_driver_algs[i].alg.skcipher; alg =3D &skcipher_alg->base; =20 - if (has_ftr_sec1(priv)) + if (is_sec1()) alg->cra_alignmask =3D 3; =20 - if (!strcmp(alg->cra_name, "ctr(aes)") && !has_ftr_sec1(priv) && + if (!strcmp(alg->cra_name, "ctr(aes)") && !is_sec1() && DESC_TYPE(skcipher_driver_algs[i].desc_hdr_template) !=3D DESC_TYPE(DESC_HDR_TYPE_AESU_CTR_NONSNOOP)) { continue; diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index c93e3b551f6d..8ea26422f449 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -44,9 +44,8 @@ static int reset_channel(struct device *dev, int ch) { struct talitos_private *priv =3D dev_get_drvdata(dev); unsigned int timeout =3D TALITOS_TIMEOUT; - bool is_sec1 =3D has_ftr_sec1(priv); =20 - if (is_sec1) { + if (is_sec1()) { setbits32(priv->chan[ch].reg + TALITOS_CCCR_LO, TALITOS1_CCCR_LO_RESET); =20 @@ -71,7 +70,7 @@ static int reset_channel(struct device *dev, int ch) setbits32(priv->chan[ch].reg + TALITOS_CCCR_LO, TALITOS_CCCR_LO_EAE | TALITOS_CCCR_LO_CDWE | TALITOS_CCCR_LO_CDIE); /* enable chaining descriptors */ - if (is_sec1) + if (is_sec1()) setbits32(priv->chan[ch].reg + TALITOS_CCCR_LO, TALITOS_CCCR_LO_NE); =20 @@ -87,8 +86,7 @@ static int reset_device(struct device *dev) { struct talitos_private *priv =3D dev_get_drvdata(dev); unsigned int timeout =3D TALITOS_TIMEOUT; - bool is_sec1 =3D has_ftr_sec1(priv); - u32 mcr =3D is_sec1 ? TALITOS1_MCR_SWR : TALITOS2_MCR_SWR; + u32 mcr =3D is_sec1() ? TALITOS1_MCR_SWR : TALITOS2_MCR_SWR; =20 setbits32(priv->reg + TALITOS_MCR, mcr); =20 @@ -116,7 +114,6 @@ static int init_device(struct device *dev) { struct talitos_private *priv =3D dev_get_drvdata(dev); int ch, err; - bool is_sec1 =3D has_ftr_sec1(priv); =20 /* * Master reset @@ -140,7 +137,7 @@ static int init_device(struct device *dev) } =20 /* enable channel done and error interrupts */ - if (is_sec1) { + if (is_sec1()) { clrbits32(priv->reg + TALITOS_IMR, TALITOS1_IMR_INIT); clrbits32(priv->reg + TALITOS_IMR_LO, TALITOS1_IMR_LO_INIT); /* disable parity error check in DEU (erroneous? test vect.) */ @@ -159,14 +156,14 @@ static int init_device(struct device *dev) } =20 static void dma_map_request(struct device *dev, struct talitos_request *re= quest, - struct talitos_desc *desc, bool is_sec1) + struct talitos_desc *desc) { struct talitos_edesc *edesc =3D container_of(desc, struct talitos_edesc, desc); dma_addr_t dma_desc, prev_dma_desc; struct talitos_edesc *prev_edesc =3D NULL; =20 - if (is_sec1) { + if (is_sec1()) { while (edesc) { edesc->desc.hdr1 =3D edesc->desc.hdr; =20 @@ -220,7 +217,6 @@ int talitos_submit(struct device *dev, int ch, struct t= alitos_desc *desc, struct talitos_request *request; unsigned long flags; int head; - bool is_sec1 =3D has_ftr_sec1(priv); =20 spin_lock_irqsave(&priv->chan[ch].head_lock, flags); =20 @@ -234,7 +230,7 @@ int talitos_submit(struct device *dev, int ch, struct t= alitos_desc *desc, request =3D &priv->chan[ch].fifo[head]; =20 /* map descriptor and save caller data */ - dma_map_request(dev, request, desc, is_sec1); + dma_map_request(dev, request, desc); request->callback =3D callback; request->context =3D context; =20 @@ -257,12 +253,12 @@ int talitos_submit(struct device *dev, int ch, struct= talitos_desc *desc, } =20 static __be32 get_request_hdr(struct device *dev, - struct talitos_request *request, bool is_sec1) + struct talitos_request *request) { struct talitos_edesc *edesc; dma_addr_t dma_desc; =20 - if (!is_sec1) { + if (!is_sec1()) { dma_sync_single_for_cpu(dev, request->dma_desc, TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL); =20 @@ -283,11 +279,11 @@ static __be32 get_request_hdr(struct device *dev, } =20 static void dma_unmap_request(struct device *dev, - struct talitos_request *request, bool is_sec1) + struct talitos_request *request) { struct talitos_edesc *edesc; =20 - if (is_sec1) { + if (is_sec1()) { dma_unmap_single(dev, request->dma_desc, TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL); edesc =3D container_of(request->desc, struct talitos_edesc, desc); @@ -312,7 +308,6 @@ static void flush_channel(struct device *dev, int ch, i= nt error, int reset_ch) struct talitos_request *request, saved_req; unsigned long flags; int tail, status; - bool is_sec1 =3D has_ftr_sec1(priv); =20 spin_lock_irqsave(&priv->chan[ch].tail_lock, flags); =20 @@ -324,7 +319,7 @@ static void flush_channel(struct device *dev, int ch, i= nt error, int reset_ch) =20 /* descriptors with their done bits set don't get the error */ rmb(); - hdr =3D get_request_hdr(dev, request, is_sec1); + hdr =3D get_request_hdr(dev, request); =20 if ((hdr & DESC_HDR_DONE) =3D=3D DESC_HDR_DONE) status =3D 0; @@ -334,7 +329,7 @@ static void flush_channel(struct device *dev, int ch, i= nt error, int reset_ch) else status =3D error; =20 - dma_unmap_request(dev, request, is_sec1); + dma_unmap_request(dev, request); =20 /* copy entries so we can call callback outside lock */ saved_req.desc =3D request->desc; @@ -424,13 +419,13 @@ DEF_TALITOS2_DONE(ch0_2, TALITOS2_ISR_CH_0_2_DONE) DEF_TALITOS2_DONE(ch1_3, TALITOS2_ISR_CH_1_3_DONE) =20 static __be32 search_desc_hdr_in_request(struct talitos_request *request, - dma_addr_t cur_desc, bool is_sec1) + dma_addr_t cur_desc) { struct talitos_edesc *edesc; =20 if (request->dma_desc =3D=3D cur_desc) { return request->desc->hdr; - } else if (is_sec1) { + } else if (is_sec1()) { edesc =3D container_of(request->desc, struct talitos_edesc, desc); while (edesc->next_desc) { if (edesc->desc.next_desc =3D=3D cpu_to_be32(cur_desc)) @@ -447,7 +442,6 @@ static __be32 search_desc_hdr_in_request(struct talitos= _request *request, static __be32 current_desc_hdr(struct device *dev, int ch) { struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); struct talitos_request *request; int tail, iter; dma_addr_t cur_desc; @@ -466,7 +460,7 @@ static __be32 current_desc_hdr(struct device *dev, int = ch) do { request =3D &priv->chan[ch].fifo[iter]; =20 - hdr =3D search_desc_hdr_in_request(request, cur_desc, is_sec1); + hdr =3D search_desc_hdr_in_request(request, cur_desc); if (hdr) break; =20 @@ -563,12 +557,11 @@ static void talitos_error(struct device *dev, u32 isr= , u32 isr_lo) unsigned int timeout =3D TALITOS_TIMEOUT; int ch, error, reset_dev =3D 0; u32 v_lo; - bool is_sec1 =3D has_ftr_sec1(priv); - int reset_ch =3D is_sec1 ? 1 : 0; /* only SEC2 supports continuation */ + int reset_ch =3D is_sec1() ? 1 : 0; /* only SEC2 supports continuation */ =20 for (ch =3D 0; ch < priv->num_channels; ch++) { /* skip channels without errors */ - if (is_sec1) { + if (is_sec1()) { /* bits 29, 31, 17, 19 */ if (!(isr & (1 << (29 + (ch & 1) * 2 - (ch & 2) * 6)))) continue; @@ -594,19 +587,19 @@ static void talitos_error(struct device *dev, u32 isr= , u32 isr_lo) if (v_lo & TALITOS_CCPSR_LO_MDTE) dev_err(dev, "master data transfer error\n"); if (v_lo & TALITOS_CCPSR_LO_SGDLZ) - dev_err(dev, is_sec1 ? "pointer not complete error\n" + dev_err(dev, is_sec1() ? "pointer not complete error\n" : "s/g data length zero error\n"); if (v_lo & TALITOS_CCPSR_LO_FPZ) - dev_err(dev, is_sec1 ? "parity error\n" + dev_err(dev, is_sec1() ? "parity error\n" : "fetch pointer zero error\n"); if (v_lo & TALITOS_CCPSR_LO_IDH) dev_err(dev, "illegal descriptor header error\n"); if (v_lo & TALITOS_CCPSR_LO_IEU) - dev_err(dev, is_sec1 ? "static assignment error\n" + dev_err(dev, is_sec1() ? "static assignment error\n" : "invalid exec unit error\n"); if (v_lo & TALITOS_CCPSR_LO_EU) report_eu_error(dev, ch, current_desc_hdr(dev, ch)); - if (!is_sec1) { + if (!is_sec1()) { if (v_lo & TALITOS_CCPSR_LO_GB) dev_err(dev, "gather boundary error\n"); if (v_lo & TALITOS_CCPSR_LO_GRL) @@ -635,9 +628,9 @@ static void talitos_error(struct device *dev, u32 isr, = u32 isr_lo) } } } - if (reset_dev || (is_sec1 && isr & ~TALITOS1_ISR_4CHERR) || - (!is_sec1 && isr & ~TALITOS2_ISR_4CHERR) || isr_lo) { - if (is_sec1 && (isr_lo & TALITOS1_ISR_TEA_ERR)) + if (reset_dev || (is_sec1() && isr & ~TALITOS1_ISR_4CHERR) || + (!is_sec1() && isr & ~TALITOS2_ISR_4CHERR) || isr_lo) { + if (is_sec1() && (isr_lo & TALITOS1_ISR_TEA_ERR)) dev_err(dev, "TEA error: ISR 0x%08x_%08x\n", isr, isr_lo); else @@ -733,24 +726,22 @@ void talitos_sg_unmap(struct device *dev, struct scatterlist *dst, unsigned int len, unsigned int offset) { - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); unsigned int src_nents =3D edesc->src_nents ? : 1; unsigned int dst_nents =3D edesc->dst_nents ? : 1; =20 - if (is_sec1 && dst && dst_nents > 1) { + if (is_sec1() && dst && dst_nents > 1) { dma_sync_single_for_device(dev, edesc->dma_link_tbl + offset, len, DMA_FROM_DEVICE); sg_pcopy_from_buffer(dst, dst_nents, edesc->buf + offset, len, offset); } if (src !=3D dst) { - if (src_nents =3D=3D 1 || !is_sec1) + if (src_nents =3D=3D 1 || !is_sec1()) dma_unmap_sg(dev, src, src_nents, DMA_TO_DEVICE); =20 - if (dst && (dst_nents =3D=3D 1 || !is_sec1)) + if (dst && (dst_nents =3D=3D 1 || !is_sec1())) dma_unmap_sg(dev, dst, dst_nents, DMA_FROM_DEVICE); - } else if (src_nents =3D=3D 1 || !is_sec1) { + } else if (src_nents =3D=3D 1 || !is_sec1()) { dma_unmap_sg(dev, src, src_nents, DMA_BIDIRECTIONAL); } } @@ -783,15 +774,15 @@ static int sg_to_link_tbl_offset(struct scatterlist *= sg, int sg_count, =20 if (datalen > 0 && len > datalen) { to_talitos_ptr(link_tbl_ptr + count, - sg_dma_address(sg) + offset, datalen, 0); - to_talitos_ptr_ext_set(link_tbl_ptr + count, 0, 0); + sg_dma_address(sg) + offset, datalen); + to_talitos_ptr_ext_set(link_tbl_ptr + count, 0); count++; len -=3D datalen; offset +=3D datalen; } to_talitos_ptr(link_tbl_ptr + count, - sg_dma_address(sg) + offset, sg_next(sg) ? len : len + padding, = 0); - to_talitos_ptr_ext_set(link_tbl_ptr + count, 0, 0); + sg_dma_address(sg) + offset, sg_next(sg) ? len : len + padding); + to_talitos_ptr_ext_set(link_tbl_ptr + count, 0); count++; cryptlen -=3D len; datalen -=3D len; @@ -804,7 +795,7 @@ static int sg_to_link_tbl_offset(struct scatterlist *sg= , int sg_count, /* tag end of link table */ if (count > 0) to_talitos_ptr_ext_set(link_tbl_ptr + count - 1, - DESC_PTR_LNKTBL_RET, 0); + DESC_PTR_LNKTBL_RET); =20 return count; } @@ -815,33 +806,30 @@ int talitos_sg_map_ext(struct device *dev, struct sca= tterlist *src, unsigned int offset, int tbl_off, int elen, bool force, int align) { - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); int aligned_len =3D ALIGN(len, align); =20 if (!src) { - to_talitos_ptr(ptr, 0, 0, is_sec1); + to_talitos_ptr(ptr, 0, 0); return 1; } - to_talitos_ptr_ext_set(ptr, elen, is_sec1); + to_talitos_ptr_ext_set(ptr, elen); if (sg_count =3D=3D 1 && !force) { - to_talitos_ptr(ptr, sg_dma_address(src) + offset, aligned_len, is_sec1); + to_talitos_ptr(ptr, sg_dma_address(src) + offset, aligned_len); return sg_count; } - if (is_sec1) { - to_talitos_ptr(ptr, edesc->dma_link_tbl + offset, aligned_len, is_sec1); + if (is_sec1()) { + to_talitos_ptr(ptr, edesc->dma_link_tbl + offset, aligned_len); return sg_count; } sg_count =3D sg_to_link_tbl_offset(src, sg_count, offset, len, elen, &edesc->link_tbl[tbl_off], align); if (sg_count =3D=3D 1 && !force) { - /* Only one segment now, so no link tbl needed*/ - copy_talitos_ptr(ptr, &edesc->link_tbl[tbl_off], is_sec1); + copy_talitos_ptr(ptr, &edesc->link_tbl[tbl_off]); return sg_count; } to_talitos_ptr(ptr, edesc->dma_link_tbl + - tbl_off * sizeof(struct talitos_ptr), aligned_len, is_sec1); - to_talitos_ptr_ext_or(ptr, DESC_PTR_LNKTBL_JUMP, is_sec1); + tbl_off * sizeof(struct talitos_ptr), aligned_len); + to_talitos_ptr_ext_or(ptr, DESC_PTR_LNKTBL_JUMP); =20 return sg_count; } @@ -875,9 +863,7 @@ struct talitos_edesc *talitos_edesc_alloc(struct device= *dev, dma_addr_t iv_dma =3D 0; gfp_t flags =3D cryptoflags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : GFP_ATOMIC; - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); - int max_len =3D is_sec1 ? TALITOS1_MAX_DATA_LEN : TALITOS2_MAX_DATA_LEN; + int max_len =3D is_sec1() ? TALITOS1_MAX_DATA_LEN : TALITOS2_MAX_DATA_LEN; =20 if (cryptlen + authsize > max_len) { dev_err(dev, "length exceeds h/w max limit\n"); @@ -918,7 +904,7 @@ struct talitos_edesc *talitos_edesc_alloc(struct device= *dev, */ alloc_len =3D sizeof(struct talitos_edesc); if (src_nents || dst_nents || !encrypt) { - if (is_sec1) + if (is_sec1()) dma_len =3D (src_nents ? src_len : 0) + (dst_nents ? dst_len : 0) + authsize; else @@ -1094,14 +1080,13 @@ static int talitos_probe_irq(struct platform_device= *ofdev) struct device_node *np =3D ofdev->dev.of_node; struct talitos_private *priv =3D dev_get_drvdata(dev); int err; - bool is_sec1 =3D has_ftr_sec1(priv); =20 priv->irq[0] =3D irq_of_parse_and_map(np, 0); if (!priv->irq[0]) { dev_err(dev, "failed to map irq\n"); return -EINVAL; } - if (is_sec1) { + if (is_sec1()) { err =3D request_irq(priv->irq[0], talitos1_interrupt_4ch, 0, dev_driver_string(dev), dev); goto primary_out; @@ -1196,12 +1181,10 @@ static int talitos_probe(struct platform_device *of= dev) TALITOS_FTR_SHA224_HWINIT | TALITOS_FTR_HMAC_OK; =20 - if (of_device_is_compatible(np, "fsl,sec1.0")) { - priv->features |=3D TALITOS_FTR_SEC1; + if (of_device_is_compatible(np, "fsl,sec1.0")) talitos_init_branch(true); - } else { + else talitos_init_branch(false); - } =20 if (of_device_is_compatible(np, "fsl,sec1.2")) { priv->reg_deu =3D priv->reg + TALITOS12_DEU; @@ -1232,7 +1215,7 @@ static int talitos_probe(struct platform_device *ofde= v) if (err) goto err_out; =20 - if (has_ftr_sec1(priv)) { + if (is_sec1()) { if (priv->num_channels =3D=3D 1) tasklet_init(&priv->done_task[0], talitos1_done_ch0, (unsigned long)dev); diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index b0d176c7dab2..9bbdd409da5a 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -223,7 +223,6 @@ struct talitos_crypto_alg { #define TALITOS_FTR_HW_AUTH_CHECK 0x00000002 #define TALITOS_FTR_SHA224_HWINIT 0x00000004 #define TALITOS_FTR_HMAC_OK 0x00000008 -#define TALITOS_FTR_SEC1 0x00000010 =20 #if defined(CONFIG_CRYPTO_DEV_TALITOS1) && defined(CONFIG_CRYPTO_DEV_TALIT= OS2) DECLARE_STATIC_KEY_FALSE(talitos_is_sec1); @@ -252,20 +251,6 @@ static inline void talitos_init_branch(bool sec1) =20 #endif =20 -/* - * If both CONFIG_CRYPTO_DEV_TALITOS1 and CONFIG_CRYPTO_DEV_TALITOS2 are - * defined, we check the features which are set according to the device tr= ee. - * Otherwise, we answer true or false directly - */ -static inline bool has_ftr_sec1(struct talitos_private *priv) -{ - if (IS_ENABLED(CONFIG_CRYPTO_DEV_TALITOS1) && - IS_ENABLED(CONFIG_CRYPTO_DEV_TALITOS2)) - return priv->features & TALITOS_FTR_SEC1; - - return IS_ENABLED(CONFIG_CRYPTO_DEV_TALITOS1); -} - /* * TALITOS_xxx_LO addresses point to the low data bits (32-63) of the regi= ster */ @@ -504,10 +489,10 @@ static inline bool has_ftr_sec1(struct talitos_privat= e *priv) #define DESC_PTR_LNKTBL_NEXT 0x01 =20 static inline void to_talitos_ptr(struct talitos_ptr *ptr, dma_addr_t dma_= addr, - unsigned int len, bool is_sec1) + unsigned int len) { ptr->ptr =3D cpu_to_be32(lower_32_bits(dma_addr)); - if (is_sec1) { + if (is_sec1()) { ptr->len1 =3D cpu_to_be16(len); } else { ptr->len =3D cpu_to_be16(len); @@ -516,10 +501,10 @@ static inline void to_talitos_ptr(struct talitos_ptr = *ptr, dma_addr_t dma_addr, } =20 static inline void copy_talitos_ptr(struct talitos_ptr *dst_ptr, - struct talitos_ptr *src_ptr, bool is_sec1) + struct talitos_ptr *src_ptr) { dst_ptr->ptr =3D src_ptr->ptr; - if (is_sec1) { + if (is_sec1()) { dst_ptr->len1 =3D src_ptr->len1; } else { dst_ptr->len =3D src_ptr->len; @@ -527,26 +512,23 @@ static inline void copy_talitos_ptr(struct talitos_pt= r *dst_ptr, } } =20 -static inline unsigned short from_talitos_ptr_len(struct talitos_ptr *ptr, - bool is_sec1) +static inline unsigned short from_talitos_ptr_len(struct talitos_ptr *ptr) { - if (is_sec1) + if (is_sec1()) return be16_to_cpu(ptr->len1); else return be16_to_cpu(ptr->len); } =20 -static inline void to_talitos_ptr_ext_set(struct talitos_ptr *ptr, u8 val, - bool is_sec1) +static inline void to_talitos_ptr_ext_set(struct talitos_ptr *ptr, u8 val) { - if (!is_sec1) + if (!is_sec1()) ptr->j_extent =3D val; } =20 -static inline void to_talitos_ptr_ext_or(struct talitos_ptr *ptr, u8 val, - bool is_sec1) +static inline void to_talitos_ptr_ext_or(struct talitos_ptr *ptr, u8 val) { - if (!is_sec1) + if (!is_sec1()) ptr->j_extent |=3D val; } =20 @@ -559,10 +541,8 @@ static void __map_single_talitos_ptr(struct device *de= v, unsigned long attrs) { dma_addr_t dma_addr =3D dma_map_single_attrs(dev, data, len, dir, attrs); - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); =20 - to_talitos_ptr(ptr, dma_addr, len, is_sec1); + to_talitos_ptr(ptr, dma_addr, len); } =20 static inline void map_single_talitos_ptr(struct device *dev, @@ -589,11 +569,8 @@ static inline void unmap_single_talitos_ptr(struct dev= ice *dev, struct talitos_ptr *ptr, enum dma_data_direction dir) { - struct talitos_private *priv =3D dev_get_drvdata(dev); - bool is_sec1 =3D has_ftr_sec1(priv); - - dma_unmap_single(dev, be32_to_cpu(ptr->ptr), - from_talitos_ptr_len(ptr, is_sec1), dir); + dma_unmap_single(dev, be32_to_cpu(ptr->ptr), from_talitos_ptr_len(ptr), + dir); } =20 int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc, --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F2313976A9; Tue, 21 Jul 2026 14:00:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642409; cv=none; b=UxKA8IlZajnKWnj2Kd6MlTJBy+9s3l59NlCLDekt+3euT9Q1iHP1IidN3QueIKyJL84BAtoSCklAh2DtbGlDOGD2oK4+dX8BQvVqngUP5p4eQubwmk2HGIrOKadaW8z+XZSdUbr0WzueFLWDTRaqyeK7Ntne9KUGMJshGqzOE+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642409; c=relaxed/simple; bh=wOjqiaP/Ndr+TaLdqwDEnkQDZj4oHAvv0zOf2qC4i4A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pEYF5p/bAKwmQuhJ4AWkymGvi6M12kbM848ZcqctT+rQj0lT5k90aOha/3RF5U6mFcwD96IXuGtwqHe3vuZ+buKT8zU5R0B/NxOxWMehkfR4iwAjRmRcq7zU4VWfKVxXtfmUXkF7c201/jeJoPgNjc5IckoOSqwyvtBRAsBh6wc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=rkrha8CD; arc=none smtp.client-ip=185.246.85.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="rkrha8CD" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id D8FF24E40EA3; Tue, 21 Jul 2026 14:00:04 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id AC48560368; Tue, 21 Jul 2026 14:00:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 7464811BD3B77; Tue, 21 Jul 2026 16:00:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642404; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Oi32BiZrL6B6ohhvqtg+GKSoiSQ9tROQXg+lcHjFfbE=; b=rkrha8CD4I25MABFDEYwJkukBtNo9m5W6Ol2PAwilZeRD9D3/E7li/IfrEgg0y5SQcr7dB HKamNovQ5axgeBuhgcwk8Y5ttmIdMB8+YDPVEVRPRPrPZ5ELY4jH2t09Tzlif8mwFyIsOk 6a2CVty7SfKjWFiNCivl6dhkgCJlOtlgw8bPVe7egOjD/M+qhprdBTMrgcQ9MRmyo8ed+o 1Nt9A/2aNrUmECgPLnFcfpZtMuVPaam9UW/lbEv8AXSyp8k83qNnDJ5f+g8A/7fB267u5m 1g3WJ0xqBwTgcXOoHQcnAaAM7WUxC+c3/OdkxcN/kxad7rs255bNia1DlU7pWg== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:45 +0200 Subject: [PATCH v3 18/19] crypto: talitos - Introduce per-SEC-version descriptor and pointer structures Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-18-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=24147; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=wOjqiaP/Ndr+TaLdqwDEnkQDZj4oHAvv0zOf2qC4i4A=; b=39QJF2y8oes5WqTd/M/T8WGliY4ZMFVKyLM9f9YXqkBpSlb9c2NcWcsgIDwPp5wGo1IekWJ3j i3FSsyws95KDdGorWyjfVT+YGQH1XMrkxtYLeWfdSpgsHWq7ZKIbqvj X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 The SEC1 and SEC2 hardware descriptor and pointer formats differ in many ways: - SEC1 pointers have a 16-bit reserved field followed by a 16-bit length and 32-bit address, while SEC2 pointers pack a 16-bit length, 8-bit jump/extent, 8-bit extended address, and 32-bit address. - SEC1 descriptors chain through a next_desc field absent from SEC2, while SEC2 has a hdr_lo field that SEC1 lacks. In the current code, reading those structures and mapping them to the documentation is not obvious. Instead of using anonymous union members, define two separate structures for hardware descriptor and pointer. The counterpart is that some added helpers are needed. Even if the structure is naturally aligned and no padding is added, add the __packed attribute to hint that these structures are used by the hardware. Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos-aead.c | 42 +++++----- drivers/crypto/talitos/talitos-hash.c | 34 ++++---- drivers/crypto/talitos/talitos-skcipher.c | 27 +++--- drivers/crypto/talitos/talitos.c | 20 ++--- drivers/crypto/talitos/talitos.h | 131 +++++++++++++++++++++++---= ---- 5 files changed, 162 insertions(+), 92 deletions(-) diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c index d9e27eddfd1d..667b99581702 100644 --- a/drivers/crypto/talitos/talitos-aead.c +++ b/drivers/crypto/talitos/talitos-aead.c @@ -94,11 +94,11 @@ static void ipsec_esp_unmap(struct device *dev, unsigned int ivsize =3D crypto_aead_ivsize(aead); unsigned int authsize =3D crypto_aead_authsize(aead); unsigned int cryptlen =3D areq->cryptlen - (encrypt ? 0 : authsize); - bool is_ipsec_esp =3D edesc->desc.hdr & DESC_HDR_TYPE_IPSEC_ESP; - struct talitos_ptr *civ_ptr =3D &edesc->desc.ptr[is_ipsec_esp ? 2 : 3]; + bool is_ipsec_esp =3D from_talitos_desc_hdr(&edesc->desc) & DESC_HDR_TYPE= _IPSEC_ESP; + struct talitos_ptr *civ_ptr =3D from_talitos_desc_ptr(&edesc->desc, is_ip= sec_esp ? 2 : 3); =20 if (is_ipsec_esp) - unmap_single_talitos_ptr(dev, &edesc->desc.ptr[6], + unmap_single_talitos_ptr(dev, from_talitos_desc_ptr(&edesc->desc, 6), DMA_FROM_DEVICE); unmap_single_talitos_ptr(dev, civ_ptr, DMA_TO_DEVICE); =20 @@ -179,7 +179,7 @@ static void ipsec_esp_decrypt_hwauth_done(struct device= *dev, ipsec_esp_unmap(dev, edesc, req, false); =20 /* check ICV auth status */ - if (!err && ((desc->hdr_lo & DESC_HDR_LO_ICCR1_MASK) !=3D + if (!err && ((from_talitos_desc_hdr_lo(desc) & DESC_HDR_LO_ICCR1_MASK) != =3D DESC_HDR_LO_ICCR1_PASS)) err =3D -EBADMSG; =20 @@ -208,13 +208,13 @@ static int ipsec_esp(struct talitos_edesc *edesc, str= uct aead_request *areq, int sg_count, ret; int elen =3D 0; bool sync_needed =3D false; - bool is_ipsec_esp =3D desc->hdr & DESC_HDR_TYPE_IPSEC_ESP; - struct talitos_ptr *civ_ptr =3D &desc->ptr[is_ipsec_esp ? 2 : 3]; - struct talitos_ptr *ckey_ptr =3D &desc->ptr[is_ipsec_esp ? 3 : 2]; + bool is_ipsec_esp =3D from_talitos_desc_hdr(desc) & DESC_HDR_TYPE_IPSEC_E= SP; + struct talitos_ptr *civ_ptr =3D from_talitos_desc_ptr(desc, is_ipsec_esp = ? 2 : 3); + struct talitos_ptr *ckey_ptr =3D from_talitos_desc_ptr(desc, is_ipsec_esp= ? 3 : 2); dma_addr_t dma_icv =3D edesc->dma_link_tbl + edesc->dma_len - authsize; =20 /* hmac key */ - to_talitos_ptr(&desc->ptr[0], ctx->dma_key, ctx->authkeylen); + to_talitos_ptr(from_talitos_desc_ptr(desc, 0), ctx->dma_key, ctx->authkey= len); =20 sg_count =3D edesc->src_nents ?: 1; if (is_sec1() && sg_count > 1) @@ -227,7 +227,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struc= t aead_request *areq, =20 /* hmac data */ ret =3D talitos_sg_map(dev, areq->src, areq->assoclen, edesc, - &desc->ptr[1], sg_count, 0, tbl_off); + from_talitos_desc_ptr(desc, 1), sg_count, 0, tbl_off); =20 if (ret > 1) { tbl_off +=3D ret; @@ -247,10 +247,10 @@ static int ipsec_esp(struct talitos_edesc *edesc, str= uct aead_request *areq, * extent is bytes of HMAC postpended to ciphertext, * typically 12 for ipsec */ - if (is_ipsec_esp && (desc->hdr & DESC_HDR_MODE1_MDEU_CICV)) + if (is_ipsec_esp && (from_talitos_desc_hdr(desc) & DESC_HDR_MODE1_MDEU_CI= CV)) elen =3D authsize; =20 - ret =3D talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->ptr[4], + ret =3D talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, from_talitos_= desc_ptr(desc, 4), sg_count, areq->assoclen, tbl_off, elen, false, 1); =20 @@ -270,7 +270,7 @@ static int ipsec_esp(struct talitos_edesc *edesc, struc= t aead_request *areq, elen =3D authsize; else elen =3D 0; - ret =3D talitos_sg_map_ext(dev, areq->dst, cryptlen, edesc, &desc->ptr[5], + ret =3D talitos_sg_map_ext(dev, areq->dst, cryptlen, edesc, from_talitos_= desc_ptr(desc, 5), sg_count, areq->assoclen, tbl_off, elen, is_ipsec_esp && !encrypt, 1); tbl_off +=3D ret; @@ -284,19 +284,19 @@ static int ipsec_esp(struct talitos_edesc *edesc, str= uct aead_request *areq, =20 /* icv data follows link tables */ to_talitos_ptr(tbl_ptr, dma_icv, authsize); - to_talitos_ptr_ext_or(&desc->ptr[5], authsize); + to_talitos_ptr_ext_or(from_talitos_desc_ptr(desc, 5), authsize); sync_needed =3D true; } else if (!encrypt) { - to_talitos_ptr(&desc->ptr[6], dma_icv, authsize); + to_talitos_ptr(from_talitos_desc_ptr(desc, 6), dma_icv, authsize); sync_needed =3D true; } else if (!is_ipsec_esp) { - talitos_sg_map(dev, areq->dst, authsize, edesc, &desc->ptr[6], + talitos_sg_map(dev, areq->dst, authsize, edesc, from_talitos_desc_ptr(de= sc, 6), sg_count, areq->assoclen + cryptlen, tbl_off); } =20 /* iv out */ if (is_ipsec_esp) - map_single_talitos_ptr(dev, &desc->ptr[6], ivsize, ctx->iv, + map_single_talitos_ptr(dev, from_talitos_desc_ptr(desc, 6), ivsize, ctx-= >iv, DMA_FROM_DEVICE); =20 if (sync_needed) @@ -339,7 +339,7 @@ static int aead_encrypt(struct aead_request *req) return PTR_ERR(edesc); =20 /* set encrypt */ - edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; + to_talitos_desc_hdr(&edesc->desc, ctx->desc_hdr_template | DESC_HDR_MODE0= _ENCRYPT); =20 return ipsec_esp(edesc, req, true, ipsec_esp_encrypt_done); } @@ -358,15 +358,15 @@ static int aead_decrypt(struct aead_request *req) if (IS_ERR(edesc)) return PTR_ERR(edesc); =20 - if ((edesc->desc.hdr & DESC_HDR_TYPE_IPSEC_ESP) && + if ((from_talitos_desc_hdr(&edesc->desc) & DESC_HDR_TYPE_IPSEC_ESP) && (priv->features & TALITOS_FTR_HW_AUTH_CHECK) && ((!edesc->src_nents && !edesc->dst_nents) || priv->features & TALITOS_FTR_SRC_LINK_TBL_LEN_INCLUDES_EXTENT)) { =20 /* decrypt and check the ICV */ - edesc->desc.hdr =3D ctx->desc_hdr_template | + to_talitos_desc_hdr(&edesc->desc, ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND | - DESC_HDR_MODE1_MDEU_CICV; + DESC_HDR_MODE1_MDEU_CICV); =20 /* reset integrity check result bits */ =20 @@ -375,7 +375,7 @@ static int aead_decrypt(struct aead_request *req) } =20 /* Have to check the ICV with software */ - edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND; + to_talitos_desc_hdr(&edesc->desc, ctx->desc_hdr_template | DESC_HDR_DIR_I= NBOUND); =20 /* stash incoming ICV for later cmp with ICV generated by the h/w */ icvdata =3D edesc->buf + edesc->dma_len; diff --git a/drivers/crypto/talitos/talitos-hash.c b/drivers/crypto/talitos= /talitos-hash.c index c7a1a622c014..e214b6b3fb27 100644 --- a/drivers/crypto/talitos/talitos-hash.c +++ b/drivers/crypto/talitos/talitos-hash.c @@ -46,7 +46,7 @@ static void common_nonsnoop_hash_unmap(struct device *dev, struct crypto_ahash *tfm =3D crypto_ahash_reqtfm(areq); struct talitos_desc *desc =3D &edesc->desc; =20 - unmap_single_talitos_ptr(dev, &desc->ptr[5], DMA_FROM_DEVICE); + unmap_single_talitos_ptr(dev, from_talitos_desc_ptr(desc, 5), DMA_FROM_DE= VICE); =20 if (edesc->last && req_ctx->last_request) memcpy(areq->result, req_ctx->hw_context, @@ -56,8 +56,8 @@ static void common_nonsnoop_hash_unmap(struct device *dev, talitos_sg_unmap(dev, edesc, edesc->src, NULL, 0, 0); =20 /* When using hashctx-in, must unmap it. */ - if (from_talitos_ptr_len(&desc->ptr[1])) - unmap_single_talitos_ptr(dev, &desc->ptr[1], + if (from_talitos_ptr_len(from_talitos_desc_ptr(desc, 1))) + unmap_single_talitos_ptr(dev, from_talitos_desc_ptr(desc, 1), DMA_TO_DEVICE); =20 if (edesc->dma_len) @@ -132,7 +132,7 @@ static void talitos_handle_buggy_hash(struct talitos_ah= ash_req_ctx *req_ctx, memcpy(&req_ctx->padding_buf[56], &len, sizeof(len)); =20 pr_err_once("Bug in SEC1, padding ourself\n"); - edesc->desc.hdr &=3D ~DESC_HDR_MODE0_MDEU_PAD; + and_talitos_desc_hdr(&edesc->desc, ~DESC_HDR_MODE0_MDEU_PAD); map_single_talitos_ptr(ctx->dev, ptr, sizeof(req_ctx->padding_buf), (char *)req_ctx->padding_buf, DMA_TO_DEVICE); } @@ -153,7 +153,7 @@ static void common_nonsnoop_hash(struct talitos_edesc *= edesc, =20 /* hash context in */ if (!edesc->first || !req_ctx->first_request || req_ctx->swinit) { - map_single_talitos_ptr_nosync(dev, &desc->ptr[1], + map_single_talitos_ptr_nosync(dev, from_talitos_desc_ptr(desc, 1), req_ctx->hw_context_size, req_ctx->hw_context, DMA_TO_DEVICE); @@ -164,7 +164,7 @@ static void common_nonsnoop_hash(struct talitos_edesc *= edesc, =20 /* HMAC key */ if (ctx->keylen) - to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen); + to_talitos_ptr(from_talitos_desc_ptr(desc, 2), ctx->dma_key, ctx->keylen= ); =20 sg_count =3D edesc->src_nents ?: 1; if (is_sec1() && sg_count > 1) @@ -175,7 +175,7 @@ static void common_nonsnoop_hash(struct talitos_edesc *= edesc, /* * data in */ - sg_count =3D talitos_sg_map(dev, edesc->src, length, edesc, &desc->ptr[3], + sg_count =3D talitos_sg_map(dev, edesc->src, length, edesc, from_talitos_= desc_ptr(desc, 3), sg_count, 0, 0); if (sg_count > 1) sync_needed =3D true; @@ -184,19 +184,19 @@ static void common_nonsnoop_hash(struct talitos_edesc= *edesc, =20 /* hash/HMAC out -or- hash context out */ if (edesc->last && req_ctx->last_request) - map_single_talitos_ptr(dev, &desc->ptr[5], + map_single_talitos_ptr(dev, from_talitos_desc_ptr(desc, 5), crypto_ahash_digestsize(tfm), req_ctx->hw_context, DMA_FROM_DEVICE); else - map_single_talitos_ptr_nosync(dev, &desc->ptr[5], + map_single_talitos_ptr_nosync(dev, from_talitos_desc_ptr(desc, 5), req_ctx->hw_context_size, req_ctx->hw_context, DMA_FROM_DEVICE); =20 /* last DWORD empty */ =20 - if (is_sec1() && from_talitos_ptr_len(&desc->ptr[3]) =3D=3D 0) - talitos_handle_buggy_hash(req_ctx, ctx, edesc, &desc->ptr[3]); + if (is_sec1() && from_talitos_ptr_len(from_talitos_desc_ptr(desc, 3)) =3D= =3D 0) + talitos_handle_buggy_hash(req_ctx, ctx, edesc, from_talitos_desc_ptr(des= c, 3)); =20 if (sync_needed) dma_sync_single_for_device(dev, edesc->dma_link_tbl, @@ -243,19 +243,19 @@ ahash_process_req_prepare(struct ahash_request *areq,= unsigned int nbytes, } =20 edesc->src =3D scatterwalk_ffwd(edesc->bufsl, areq->src, offset); - edesc->desc.hdr =3D ctx->desc_hdr_template; + to_talitos_desc_hdr(&edesc->desc, ctx->desc_hdr_template); edesc->first =3D offset =3D=3D 0; edesc->last =3D nbytes - to_hash_this_desc =3D=3D 0; =20 /* On last one, request SEC to pad; otherwise continue */ if (req_ctx->last_request && edesc->last) - edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_PAD; + or_talitos_desc_hdr(&edesc->desc, DESC_HDR_MODE0_MDEU_PAD); else - edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_CONT; + or_talitos_desc_hdr(&edesc->desc, DESC_HDR_MODE0_MDEU_CONT); =20 /* request SEC to INIT hash. */ if (req_ctx->first_request && edesc->first && !req_ctx->swinit) - edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_INIT; + or_talitos_desc_hdr(&edesc->desc, DESC_HDR_MODE0_MDEU_INIT); =20 /* * When the tfm context has a keylen, it's an HMAC. @@ -263,11 +263,11 @@ ahash_process_req_prepare(struct ahash_request *areq,= unsigned int nbytes, */ if (ctx->keylen && ((req_ctx->first_request && edesc->first) || (req_ctx->last_request && edesc->last))) - edesc->desc.hdr |=3D DESC_HDR_MODE0_MDEU_HMAC; + or_talitos_desc_hdr(&edesc->desc, DESC_HDR_MODE0_MDEU_HMAC); =20 /* clear the DN bit */ if (is_sec1() && !edesc->last) - edesc->desc.hdr &=3D ~DESC_HDR_DONE_NOTIFY; + and_talitos_desc_hdr(&edesc->desc, ~DESC_HDR_DONE_NOTIFY); =20 common_nonsnoop_hash(edesc, areq, to_hash_this_desc); =20 diff --git a/drivers/crypto/talitos/talitos-skcipher.c b/drivers/crypto/tal= itos/talitos-skcipher.c index 2c34e2ffbf7e..79317fb7f47e 100644 --- a/drivers/crypto/talitos/talitos-skcipher.c +++ b/drivers/crypto/talitos/talitos-skcipher.c @@ -15,10 +15,10 @@ static void common_nonsnoop_unmap(struct device *dev, struct talitos_edesc *edesc, struct skcipher_request *areq) { - unmap_single_talitos_ptr(dev, &edesc->desc.ptr[5], DMA_FROM_DEVICE); + unmap_single_talitos_ptr(dev, from_talitos_desc_ptr(&edesc->desc, 5), DMA= _FROM_DEVICE); =20 talitos_sg_unmap(dev, edesc, areq->src, areq->dst, areq->cryptlen, 0); - unmap_single_talitos_ptr(dev, &edesc->desc.ptr[1], DMA_TO_DEVICE); + unmap_single_talitos_ptr(dev, from_talitos_desc_ptr(&edesc->desc, 1), DMA= _TO_DEVICE); =20 if (edesc->dma_len) dma_unmap_single(dev, edesc->dma_link_tbl, edesc->dma_len, @@ -59,16 +59,18 @@ static int common_nonsnoop(struct talitos_edesc *edesc, unsigned int ivsize =3D crypto_skcipher_ivsize(cipher); int sg_count, ret; bool sync_needed =3D false; - bool is_ctr =3D (desc->hdr & DESC_HDR_SEL0_MASK) =3D=3D DESC_HDR_SEL0_AES= U && - (desc->hdr & DESC_HDR_MODE0_AESU_MASK) =3D=3D DESC_HDR_MODE0_AESU_= CTR; + bool is_ctr =3D (from_talitos_desc_hdr(desc) & DESC_HDR_SEL0_MASK) =3D=3D + DESC_HDR_SEL0_AESU && + (from_talitos_desc_hdr(desc) & + DESC_HDR_MODE0_AESU_MASK) =3D=3D DESC_HDR_MODE0_AESU_CTR; =20 /* first DWORD empty */ =20 /* cipher iv */ - to_talitos_ptr(&desc->ptr[1], edesc->iv_dma, ivsize); + to_talitos_ptr(from_talitos_desc_ptr(desc, 1), edesc->iv_dma, ivsize); =20 /* cipher key */ - to_talitos_ptr(&desc->ptr[2], ctx->dma_key, ctx->keylen); + to_talitos_ptr(from_talitos_desc_ptr(desc, 2), ctx->dma_key, ctx->keylen); =20 sg_count =3D edesc->src_nents ?: 1; if (is_sec1() && sg_count > 1) @@ -81,8 +83,9 @@ static int common_nonsnoop(struct talitos_edesc *edesc, /* * cipher in */ - sg_count =3D talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, &desc->p= tr[3], - sg_count, 0, 0, 0, false, is_ctr ? 16 : 1); + sg_count =3D talitos_sg_map_ext(dev, areq->src, cryptlen, edesc, + from_talitos_desc_ptr(desc, 3), sg_count, + 0, 0, 0, false, is_ctr ? 16 : 1); if (sg_count > 1) sync_needed =3D true; =20 @@ -93,13 +96,13 @@ static int common_nonsnoop(struct talitos_edesc *edesc, dma_map_sg(dev, areq->dst, sg_count, DMA_FROM_DEVICE); } =20 - ret =3D talitos_sg_map(dev, areq->dst, cryptlen, edesc, &desc->ptr[4], + ret =3D talitos_sg_map(dev, areq->dst, cryptlen, edesc, from_talitos_desc= _ptr(desc, 4), sg_count, 0, (edesc->src_nents + 1)); if (ret > 1) sync_needed =3D true; =20 /* iv out */ - map_single_talitos_ptr(dev, &desc->ptr[5], ivsize, ctx->iv, + map_single_talitos_ptr(dev, from_talitos_desc_ptr(desc, 5), ivsize, ctx->= iv, DMA_FROM_DEVICE); =20 /* last DWORD empty */ @@ -189,7 +192,7 @@ static int skcipher_encrypt(struct skcipher_request *ar= eq) return PTR_ERR(edesc); =20 /* set encrypt */ - edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT; + to_talitos_desc_hdr(&edesc->desc, ctx->desc_hdr_template | DESC_HDR_MODE0= _ENCRYPT); =20 return common_nonsnoop(edesc, areq, skcipher_done); } @@ -213,7 +216,7 @@ static int skcipher_decrypt(struct skcipher_request *ar= eq) if (IS_ERR(edesc)) return PTR_ERR(edesc); =20 - edesc->desc.hdr =3D ctx->desc_hdr_template | DESC_HDR_DIR_INBOUND; + to_talitos_desc_hdr(&edesc->desc, ctx->desc_hdr_template | DESC_HDR_DIR_I= NBOUND); =20 return common_nonsnoop(edesc, areq, skcipher_done); } diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 8ea26422f449..1221eb9497fb 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -165,9 +165,7 @@ static void dma_map_request(struct device *dev, struct = talitos_request *request, =20 if (is_sec1()) { while (edesc) { - edesc->desc.hdr1 =3D edesc->desc.hdr; - - dma_desc =3D dma_map_single(dev, &edesc->desc.hdr1, + dma_desc =3D dma_map_single(dev, &edesc->desc.sec1.hdr, TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL); =20 @@ -178,7 +176,7 @@ static void dma_map_request(struct device *dev, struct = talitos_request *request, =20 /* Chain in any previous descriptors. */ =20 - prev_edesc->desc.next_desc =3D cpu_to_be32(dma_desc); + prev_edesc->desc.sec1.next_desc =3D cpu_to_be32(dma_desc); =20 dma_sync_single_for_device(dev, prev_dma_desc, TALITOS_DESC_SIZE, @@ -262,20 +260,20 @@ static __be32 get_request_hdr(struct device *dev, dma_sync_single_for_cpu(dev, request->dma_desc, TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL); =20 - return request->desc->hdr; + return request->desc->sec2.hdr; } =20 edesc =3D container_of(request->desc, struct talitos_edesc, desc); dma_desc =3D request->dma_desc; while (edesc->next_desc) { - dma_desc =3D be32_to_cpu(edesc->desc.next_desc); + dma_desc =3D be32_to_cpu(edesc->desc.sec1.next_desc); edesc =3D edesc->next_desc; } =20 dma_sync_single_for_cpu(dev, dma_desc, TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL); =20 - return edesc->desc.hdr1; + return edesc->desc.sec1.hdr; } =20 static void dma_unmap_request(struct device *dev, @@ -289,7 +287,7 @@ static void dma_unmap_request(struct device *dev, edesc =3D container_of(request->desc, struct talitos_edesc, desc); while (edesc->next_desc) { dma_unmap_single(dev, - be32_to_cpu(edesc->desc.next_desc), + be32_to_cpu(edesc->desc.sec1.next_desc), TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL); edesc =3D edesc->next_desc; } @@ -424,12 +422,12 @@ static __be32 search_desc_hdr_in_request(struct talit= os_request *request, struct talitos_edesc *edesc; =20 if (request->dma_desc =3D=3D cur_desc) { - return request->desc->hdr; + return from_talitos_desc_hdr(request->desc); } else if (is_sec1()) { edesc =3D container_of(request->desc, struct talitos_edesc, desc); while (edesc->next_desc) { - if (edesc->desc.next_desc =3D=3D cpu_to_be32(cur_desc)) - return edesc->next_desc->desc.hdr1; + if (edesc->desc.sec1.next_desc =3D=3D cpu_to_be32(cur_desc)) + return edesc->next_desc->desc.sec1.hdr; edesc =3D edesc->next_desc; } } diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index 9bbdd409da5a..2e2414ad1e03 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -36,33 +36,49 @@ #define TALITOS_MAX_IV_LENGTH 16 /* max of AES_BLOCK_SIZE, DES3_EDE_BLOCK= _SIZE */ =20 /* descriptor pointer entry */ + +struct sec1_talitos_ptr { + __be16 res; + __be16 len; + __be32 ptr; +} __packed; + +struct sec2_talitos_ptr { + __be16 len; + u8 j_extent; + u8 eptr; + __be32 ptr; +} __packed; + struct talitos_ptr { union { - struct { /* SEC2 format */ - __be16 len; /* length */ - u8 j_extent; /* jump to sg link table and/or extent*/ - u8 eptr; /* extended address */ - }; - struct { /* SEC1 format */ - __be16 res; - __be16 len1; /* length */ - }; + struct sec1_talitos_ptr sec1; + struct sec2_talitos_ptr sec2; }; - __be32 ptr; /* address */ }; =20 -/* descriptor */ +/* descriptor format */ + +struct sec1_talitos_desc { + __be32 hdr; + struct sec1_talitos_ptr ptr[7]; + __be32 next_desc; +} __packed; + +struct sec2_talitos_desc { + __be32 hdr; + __be32 hdr_lo; + struct sec2_talitos_ptr ptr[7]; +} __packed; + struct talitos_desc { - __be32 hdr; /* header high bits */ union { - __be32 hdr_lo; /* header low bits */ - __be32 hdr1; /* header for SEC1 */ + struct sec1_talitos_desc sec1; + struct sec2_talitos_desc sec2; }; - struct talitos_ptr ptr[7]; /* ptr/len pair array */ - __be32 next_desc; /* next descriptor (SEC1) */ }; =20 -#define TALITOS_DESC_SIZE (sizeof(struct talitos_desc) - sizeof(__be32)) +#define TALITOS_DESC_SIZE (sizeof(struct talitos_desc)) =20 /* * talitos_edesc - s/w-extended descriptor @@ -488,48 +504,101 @@ static inline void talitos_init_branch(bool sec1) #define DESC_PTR_LNKTBL_RET 0x02 #define DESC_PTR_LNKTBL_NEXT 0x01 =20 +static inline __be32 from_talitos_ptr(struct talitos_ptr *ptr) +{ + if (is_sec1()) + return ptr->sec1.ptr; + return ptr->sec2.ptr; +} + +static inline __be32 from_talitos_desc_hdr(struct talitos_desc *desc) +{ + if (is_sec1()) + return desc->sec1.hdr; + return desc->sec2.hdr; +} + +static inline void to_talitos_desc_hdr(struct talitos_desc *desc, __be32 v= al) +{ + if (is_sec1()) + desc->sec1.hdr =3D val; + else + desc->sec2.hdr =3D val; +} + +static inline void or_talitos_desc_hdr(struct talitos_desc *desc, __be32 v= al) +{ + if (is_sec1()) + desc->sec1.hdr |=3D val; + else + desc->sec2.hdr |=3D val; +} + +static inline void and_talitos_desc_hdr(struct talitos_desc *desc, __be32 = val) +{ + if (is_sec1()) + desc->sec1.hdr &=3D val; + else + desc->sec2.hdr &=3D val; +} + +static inline __be32 from_talitos_desc_hdr_lo(struct talitos_desc *desc) +{ + return desc->sec2.hdr_lo; +} + +static inline struct talitos_ptr * +from_talitos_desc_ptr(struct talitos_desc *desc, int idx) +{ + if (is_sec1()) + return (struct talitos_ptr *)&desc->sec1.ptr[idx]; + return (struct talitos_ptr *)&desc->sec2.ptr[idx]; +} + static inline void to_talitos_ptr(struct talitos_ptr *ptr, dma_addr_t dma_= addr, unsigned int len) { - ptr->ptr =3D cpu_to_be32(lower_32_bits(dma_addr)); if (is_sec1()) { - ptr->len1 =3D cpu_to_be16(len); + ptr->sec1.ptr =3D cpu_to_be32(lower_32_bits(dma_addr)); + ptr->sec1.len =3D cpu_to_be16(len); } else { - ptr->len =3D cpu_to_be16(len); - ptr->eptr =3D upper_32_bits(dma_addr); + ptr->sec2.ptr =3D cpu_to_be32(lower_32_bits(dma_addr)); + ptr->sec2.len =3D cpu_to_be16(len); + ptr->sec2.eptr =3D upper_32_bits(dma_addr); } } =20 static inline void copy_talitos_ptr(struct talitos_ptr *dst_ptr, struct talitos_ptr *src_ptr) { - dst_ptr->ptr =3D src_ptr->ptr; if (is_sec1()) { - dst_ptr->len1 =3D src_ptr->len1; + dst_ptr->sec1.ptr =3D src_ptr->sec1.ptr; + dst_ptr->sec1.len =3D src_ptr->sec1.len; } else { - dst_ptr->len =3D src_ptr->len; - dst_ptr->eptr =3D src_ptr->eptr; + dst_ptr->sec2.ptr =3D src_ptr->sec2.ptr; + dst_ptr->sec2.len =3D src_ptr->sec2.len; + dst_ptr->sec2.eptr =3D src_ptr->sec2.eptr; } } =20 static inline unsigned short from_talitos_ptr_len(struct talitos_ptr *ptr) { if (is_sec1()) - return be16_to_cpu(ptr->len1); + return be16_to_cpu(ptr->sec1.len); else - return be16_to_cpu(ptr->len); + return be16_to_cpu(ptr->sec2.len); } =20 static inline void to_talitos_ptr_ext_set(struct talitos_ptr *ptr, u8 val) { if (!is_sec1()) - ptr->j_extent =3D val; + ptr->sec2.j_extent =3D val; } =20 static inline void to_talitos_ptr_ext_or(struct talitos_ptr *ptr, u8 val) { if (!is_sec1()) - ptr->j_extent |=3D val; + ptr->sec2.j_extent |=3D val; } =20 /* @@ -569,8 +638,8 @@ static inline void unmap_single_talitos_ptr(struct devi= ce *dev, struct talitos_ptr *ptr, enum dma_data_direction dir) { - dma_unmap_single(dev, be32_to_cpu(ptr->ptr), from_talitos_ptr_len(ptr), - dir); + dma_unmap_single(dev, be32_to_cpu(from_talitos_ptr(ptr)), + from_talitos_ptr_len(ptr), dir); } =20 int talitos_submit(struct device *dev, int ch, struct talitos_desc *desc, --=20 2.55.0 From nobody Sat Jul 25 00:48:35 2026 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 476723A7F79 for ; Tue, 21 Jul 2026 14:00:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642409; cv=none; b=FiQ4UlQJZtVbbenky6F941HTXRYIzRVEh+EFBD322l8u8+eeqRBm62/2nfXSmwir3vSB6LnWjl6G6Ebb26C4sGC9xgrlWkfiRZ6c350ibXXbg4yady3ABV9QOUItj+uSC1dbLbzoC2qoiGuE3GDsjXwgD/4EENqRfiDGNAVIcGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784642409; c=relaxed/simple; bh=itOcTYks7XB8CxvDhYcLfUinXr3sQLi8u9lwaj5H4LU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K8+9kL0W/uJvNSW78cVu1FgZY0SyWBExz0Rr6fgXAXLadKNFn+fvLokybJo7VOlpCcsDv5ooMUo/GdVpeVOJ5cRR5+rSUWG+lKgd9M3SpfHraDw1zClV5g3WfpIhKLANwadN9mGGpArf4g6+3qA0sSO02dHMs9SNP/i9vrbgzwU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=u80r4bTt; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="u80r4bTt" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 064BC1A113F for ; Tue, 21 Jul 2026 14:00:06 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id CF4DC60368; Tue, 21 Jul 2026 14:00:05 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 66D6811BD3BDA; Tue, 21 Jul 2026 16:00:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1784642405; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=ic58REeumOPvmupb0k8pt0OlD8zn12JRYiQhzehZkoY=; b=u80r4bTtfi4+FR27WAKyRwtfU3oHtNLBSEE+mVddghrGTCDF4F0rigt5BXR/Ado1Jl7V8g P2TdpuEXQZTUaNoVWcu2BeTAaZckwCJ5b527tCBf2ykM0jzy/DGbdE4OUaFbgpVMCCPxox pLQrJl3fXMV7PzuNCFtGkvNvEob7Zr9ogM3OfCyIS/CeU1v5NCLkKkX+TnSsdH5TZaX3HF HcHyGmCKNoHsyBq31eBSYgau01n48id8WIrBF+TYvrrbR+5vzjgEhlhSkkaAgvcXHwc+Sz TPYNMdA24y3INzDYQr2EmqF0AAegO2lfr1TXzj7Tgm+xIGdMBm6ghn0rzRL4iw== From: Paul Louvel Date: Tue, 21 Jul 2026 15:59:46 +0200 Subject: [PATCH v3 19/19] crypto: talitos - Remove TALITOS_DESC_SIZE macro Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260721-7-1-rc1_talitos_cleanup-v3-19-7c71a2b77c83@bootlin.com> References: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> In-Reply-To: <20260721-7-1-rc1_talitos_cleanup-v3-0-7c71a2b77c83@bootlin.com> To: Herbert Xu , "David S. Miller" Cc: Thomas Petazzoni , Herve Codina , Christophe Leroy , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Louvel X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784642380; l=3411; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=itOcTYks7XB8CxvDhYcLfUinXr3sQLi8u9lwaj5H4LU=; b=ajfB5tMP7+1U8a2ZGGNCiuEU/A85/RufmanfIf0wTKf1NW09fdanuSFm4WODJnCLSibfukIGM 6kTr59zbbl7DcA6V3e/8hmpbS4MlqBFBbNrSFnsSIBXb3utqa/LQM0Q X-Developer-Key: i=paul.louvel@bootlin.com; a=ed25519; pk=eLW50NT18UAvUT5cAcYf88zNbBCZDLFXuptpyLVhVIU= X-Last-TLS-Session-Version: TLSv1.3 Now that TALITOS_DESC_SIZE is simply sizeof(struct talitos_desc) with no arithmetic, the macro is useless. Replace all occurrences with the underlying sizeof expression and remove the macro. Signed-off-by: Paul Louvel --- drivers/crypto/talitos/talitos.c | 16 ++++++++-------- drivers/crypto/talitos/talitos.h | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 1221eb9497fb..7faf3c2606a9 100644 --- a/drivers/crypto/talitos/talitos.c +++ b/drivers/crypto/talitos/talitos.c @@ -166,7 +166,7 @@ static void dma_map_request(struct device *dev, struct = talitos_request *request, if (is_sec1()) { while (edesc) { dma_desc =3D dma_map_single(dev, &edesc->desc.sec1.hdr, - TALITOS_DESC_SIZE, + sizeof(struct talitos_desc), DMA_BIDIRECTIONAL); =20 if (!prev_edesc) { @@ -179,7 +179,7 @@ static void dma_map_request(struct device *dev, struct = talitos_request *request, prev_edesc->desc.sec1.next_desc =3D cpu_to_be32(dma_desc); =20 dma_sync_single_for_device(dev, prev_dma_desc, - TALITOS_DESC_SIZE, + sizeof(struct talitos_desc), DMA_TO_DEVICE); =20 next: @@ -188,7 +188,7 @@ static void dma_map_request(struct device *dev, struct = talitos_request *request, edesc =3D edesc->next_desc; } } else { - request->dma_desc =3D dma_map_single(dev, desc, TALITOS_DESC_SIZE, + request->dma_desc =3D dma_map_single(dev, desc, sizeof(struct talitos_de= sc), DMA_BIDIRECTIONAL); } } @@ -258,7 +258,7 @@ static __be32 get_request_hdr(struct device *dev, =20 if (!is_sec1()) { dma_sync_single_for_cpu(dev, request->dma_desc, - TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL); + sizeof(struct talitos_desc), DMA_BIDIRECTIONAL); =20 return request->desc->sec2.hdr; } @@ -270,7 +270,7 @@ static __be32 get_request_hdr(struct device *dev, edesc =3D edesc->next_desc; } =20 - dma_sync_single_for_cpu(dev, dma_desc, TALITOS_DESC_SIZE, + dma_sync_single_for_cpu(dev, dma_desc, sizeof(struct talitos_desc), DMA_BIDIRECTIONAL); =20 return edesc->desc.sec1.hdr; @@ -282,17 +282,17 @@ static void dma_unmap_request(struct device *dev, struct talitos_edesc *edesc; =20 if (is_sec1()) { - dma_unmap_single(dev, request->dma_desc, TALITOS_DESC_SIZE, + dma_unmap_single(dev, request->dma_desc, sizeof(struct talitos_desc), DMA_BIDIRECTIONAL); edesc =3D container_of(request->desc, struct talitos_edesc, desc); while (edesc->next_desc) { dma_unmap_single(dev, be32_to_cpu(edesc->desc.sec1.next_desc), - TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL); + sizeof(struct talitos_desc), DMA_BIDIRECTIONAL); edesc =3D edesc->next_desc; } } else { - dma_unmap_single(dev, request->dma_desc, TALITOS_DESC_SIZE, + dma_unmap_single(dev, request->dma_desc, sizeof(struct talitos_desc), DMA_BIDIRECTIONAL); } } diff --git a/drivers/crypto/talitos/talitos.h b/drivers/crypto/talitos/tali= tos.h index 2e2414ad1e03..6b9ce69daed4 100644 --- a/drivers/crypto/talitos/talitos.h +++ b/drivers/crypto/talitos/talitos.h @@ -78,8 +78,6 @@ struct talitos_desc { }; }; =20 -#define TALITOS_DESC_SIZE (sizeof(struct talitos_desc)) - /* * talitos_edesc - s/w-extended descriptor * @bufsl: scatterlist buffer --=20 2.55.0