From nobody Fri Sep 25 23:11:02 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 44B3947012F for ; Mon, 7 Sep 2026 13:23:17 +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=1788787405; cv=none; b=Io1/JRs3jhY+8ui83eEC31rRDz1RD8eJ7THJtlzis/TTrppYGofYUZ/+Jb7bFMUWQXJIoqIKJCdLg7jL6Kxga4u0LtQ2Lbv7ie8JKPU/NOHaBlEqobavfDwKT4/gUTvE5UlQ2nS5DB+EzR+MdAjL+d/he0zYT520Xy+UeJj5HaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787405; c=relaxed/simple; bh=Nee1jf3OCayH5XT/Zvq8GVToz6FudLAtWDjVs4l3SaI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Z1iR90iegyWc/3vWn/Qti1uh3APJRCgH8WlEZEVx35vun64wvjLSBYtwhMnia744GFsGlXAongYzBXtHONTx+53GpDujRJwFbiS/Uv6zrA43w6G92Z3vbSG89Cm/27r/waHlvP8v8y79/EDjbc5oMGklK0VlnEBh5QlrKHAhMBY= 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=W5j//nR1; 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="W5j//nR1" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 573BA4E4156E; Mon, 7 Sep 2026 13:23:15 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 2A68C60383; Mon, 7 Sep 2026 13:23:15 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 6BA0A11C79257; Mon, 7 Sep 2026 15:23:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787394; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=OF1QihmEr8E0e6FSAn2DRKMeLXaDT4/OQoljcrfdKBc=; b=W5j//nR19GyQKYHRcgExl1Hq4uFsqQrBWSBV6AxcdExgsNOOb5alrglwg7u9w3r5prEwl+ fw6ifw2cLEKmDq0orZabkhqmi0acn35aN1cbvTKZ7HVBWyr22O0PGImAz7/V0pO0u5w1T5 Q8Y+DeGz0/ul84ZmM5rat6t+3uikAl/xz3X6strdMMAbCiYc75RC/KMIUHxec3sbPWL7iw WqY6kodsOUy3HSVBUKQ2YXwRZsIb02FkmWgbMbgjbMrkTifvxV2B+erX7CneU5rCjPPlU2 M48fUTnTUjm0/+bBi/0Mt78f4rYmtInsSAqYYuqRmGRKjfI4bzh0cA0WVNTZyw== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:35 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-1-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=16169; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=Nee1jf3OCayH5XT/Zvq8GVToz6FudLAtWDjVs4l3SaI=; b=yBVt6ICq/RKtK3q95KItuv4dJs4quLvo7ke6gISHuumUIcTBEHrq2V1IW59W9b11/agaf+Kio GAD/K0KLqNIAxWe9q3mf2k7rGJ8k4CmNgDc/Q3/VVRXzGiOJiIXm03i 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 | 178 +++++++++++++++++++------------------------= ---- 1 file changed, 70 insertions(+), 108 deletions(-) diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index 584508963241..fc443374603a 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,24 @@ 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 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, - }; - +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 be_len =3D cpu_to_be64(req_ctx->message_size << 3); + __le64 le_len =3D cpu_to_le64(req_ctx->message_size << 3); + + memset(req_ctx->padding_buf, 0, sizeof(req_ctx->padding_buf)); + req_ctx->padding_buf[0] =3D 0x80; + if (edesc->desc.hdr & DESC_HDR_MODE0_MDEU_MD5) + memcpy(&req_ctx->padding_buf[56], &le_len, sizeof(le_len)); + else + memcpy(&req_ctx->padding_buf[56], &be_len, sizeof(be_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(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 +1932,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 +1965,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 +1978,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 +2031,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, @@ -2111,6 +2052,8 @@ static int ahash_process_req(struct ahash_request *ar= eq, unsigned int nbytes) ret =3D talitos_submit(dev, ctx->ch, &edesc->desc, ahash_done, areq); if (ret !=3D -EINPROGRESS) free_edesc_list_from(areq, edesc); + else + req_ctx->message_size +=3D nbytes_to_hash; =20 return ret; } @@ -2125,8 +2068,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) @@ -2134,6 +2075,7 @@ static int ahash_init(struct ahash_request *areq) : TALITOS_MDEU_CONTEXT_SIZE_SHA384_SHA512; req_ctx->hw_context_size =3D size; req_ctx->last_request =3D 0; + req_ctx->message_size =3D 0; =20 dma =3D dma_map_single(dev, req_ctx->hw_context, req_ctx->hw_context_size, DMA_TO_DEVICE); @@ -2223,12 +2165,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 +2190,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 +2872,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 +2890,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 +2908,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 +2926,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 +2944,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 +2962,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 +2980,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 +2998,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 +3016,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 +3034,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 +3052,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 +3070,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 +3145,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 Fri Sep 25 23:11:02 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 D32044CA767; Mon, 7 Sep 2026 13:23:18 +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=1788787404; cv=none; b=ZgOrNHAoGwqirdqkF9yuxEY9il2uK5539JZg4eEM11EcCVbGMZZzI9G5U0rr7GduWAD242RnZuorng0iu+lJnCq03pH17rwzvWAWr/V7xGhzmuE0pWqxbwIk6JVyLD2Or1wEGeLmClCyiJP7bilryp/RDfBx8s0DKbVbrmm0Qg4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787404; c=relaxed/simple; bh=yaXKr3O9oVwNeilhdumgiN2IKJ43A5ZRpI27evZYZUA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ko/jBoV0wbWgD0kdDhsOYEUWoK5FN3pzVEriKhC8DqIbv1D6pE0ieaf7Js9CawsPFe29oKN6MR7h1BATqFNZwELHGYQH6IHXor8Msf55TbSooYck9mDJeYjzqlfMp6CDgsuBvf++k8cmmGR5cNMPLkHFvHtVBy9g0t+w897Dd6I= 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=g8P5MO1p; 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="g8P5MO1p" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 4E70B1A1A34; Mon, 7 Sep 2026 13:23:16 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 2371460383; Mon, 7 Sep 2026 13:23:16 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id DEFDB11C7AF1C; Mon, 7 Sep 2026 15:23:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787395; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=96+ugB1tJDCl1moMfOVYZVvOsc93ChgjShCEQRyijOM=; b=g8P5MO1pJ0dVt/GglN8Vow9p3a2kc1cZcS+poz74O7ibeKV4pR3zWRpkMPePmAAqtK26f+ n21/P01KhsSBIwd9qL802NPZipqvqzfqUbiIQR9e5xWCsuQOq1na5LfpvSQyIwTgGpIz2W w2w8tJEQuFhcnPWWW2iryl812htqQAMutuAMMfP2HaRemMuTXKCH2GgHeZHR3c73fGPmrr pscvI/FGWT74MyRW/Nswos/MbBYBqjxhddUSXHPGY4qWXIWeS/uKWen1ntfYrXyAjuVij+ /rkds0hl7EaDqJYjZLx006eqZAo+tUUDET/GyZcI0tO47cejPQZf/RfCvL+Jeg== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:36 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-2-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=4762; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=yaXKr3O9oVwNeilhdumgiN2IKJ43A5ZRpI27evZYZUA=; b=q7WQPtfEcimGK+gfgs+8B9EXHuL0Gtl+1yRxZQssRXNwMACCj/m4xNVHKAhoP9cQ6EdkBAvlY T7T7qQwNqKNCdNHGZ+fEIdURoYs05vMfFgvdgGPDp65CAUF028XlJch 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 Fri Sep 25 23:11:02 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 DC91B4DA546 for ; Mon, 7 Sep 2026 13:23:19 +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=1788787403; cv=none; b=P8LKYte3r5ncZvDT7lj9faw8Sk1oBHS4uelMbE+pWTqet5m0ss2NFb+3MKOKIQJmQbU5e4hZzdU6Pfclh1GzAd8L2hsT1CUiSarmOpLV0ggMRrQtmHByt3aEc8LZMAUmEr4Mp9QtuLzMZyrJfpOcYQjjOdJ4eq25rSA9bki6Os8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787403; c=relaxed/simple; bh=ApA7Ka5HrXzUkLhw8SwfYD5lxiRpAW6cnrR+r1OQvbw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ozqgwt4O58uzp9rAvIH/VelfXPqt1wsYh1Efy2rQCtoPIkHmQtcpS/MVemC8mtYwgdlC1nlwSu8nbAPPMjsd2+9BXMqdPgGjgZU0lk69utLhRbUAip3RzKjQJjwHqhCLp7yUF9rYPIGxbfR0Arx3McPTLsxcerYHJfp29+/T4AU= 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=I8KgPgK9; 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="I8KgPgK9" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 3879A1A1A36; Mon, 7 Sep 2026 13:23:17 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 0D08060383; Mon, 7 Sep 2026 13:23:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D147A11C7AF1D; Mon, 7 Sep 2026 15:23:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787396; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=VzAPDf9Nc3K7+RvIAzHAvLx5HCL8DPFPO8epWMMl5yM=; b=I8KgPgK9Rqgrxl3crt63BmCkVfrNDV6wR6RCRfmNoEG2UYFojhrldc89w62BfFzPAQUl1M 2sJDQAILATKgfkt3oARjIxxI+QVM95cv75zBOnFsQ4LBUE7umQZAnXUcSmSySBz40q44Po 36IXMsidP/ei3wAT0NWCfv2YgBRRV34pwlbPPFnSMTZiLF4A/mv23cKy/nQ3ESJyQ/5vvv MRTu1U1aJdacQMN+j2C6+G2KDUShkZOZT0NYcRg0KqFHkcDpE3w+aVxd9wMezGKBLJNeMJ prGXCUg65tS3wjQRP/OW4AZlITNJs1NxKqmwXKRKXesqkyKO4IuFAfGvzXugTQ== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:37 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-3-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=1415; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=ApA7Ka5HrXzUkLhw8SwfYD5lxiRpAW6cnrR+r1OQvbw=; b=YB+61Q+SOBC/Fh3U5bdTYabkjGMy0HtcZfKLUTsCHWdBXxJudhoZaL1ztwfIbSOr/7HHaQPdU lMluF/DkqhOBc6DULyiN3mIdvSXfUFtOiPNP9QbV5qrF8L+wx2lF8My 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 fc443374603a..9f0928312102 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 Fri Sep 25 23:11:03 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 DA60D47728A; Mon, 7 Sep 2026 13:23:20 +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=1788787408; cv=none; b=FsXPiXx5Ys/JEvUPNBt8WCIzzG0+Wq4HPpUF+cfeqKIhKciDkn8h92WeuGfggW9YGDhs/4Qqyy1mc+hWce9EfWz5RA5fqEDBDcNXJOZ9QeD2mJzMvRKahpPbe2CbgWEPaG3gtSOM61rFbR5LXQsSzdmFYZO4mWwfWRfpBv4t7p4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787408; c=relaxed/simple; bh=+V6TwRpRcAHbLUEqC/uBzK12Y4oi9gShliHqWlvH39M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=peD87I2NKHEaqQEmH2WGKl8tEvIcP7QCoqF9Uh5+F0E1zDTK289FpCUDPV4Vv0pwQwASxufKVbo5NvxZWs2FmFvfv0Olb1dnKlujMknY2NqSaWWrayfg9QjMh2P/er0EgFqTjT9p57BgVv9rF3u5FKrYXDTuCZNUfDE5XQ1XzSQ= 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=T0qqPMy7; 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="T0qqPMy7" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 7147F4E41571; Mon, 7 Sep 2026 13:23:18 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 449BC60383; Mon, 7 Sep 2026 13:23:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id BD8A811C7AF1E; Mon, 7 Sep 2026 15:23:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787397; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=HFlD0tNS//nXzuF5Pt6Q4nxt3TYbNI2OoApbDPsgJWk=; b=T0qqPMy7NcPAlhIfyKxsCCLRSaAOTRvAbyaFjfUpAQ3+7w3D6A7NRX/aKEd1spUslyrMur 2j7lCy7HM0U1SJWJC2hTLTjKygJMTyzoVEMqPL7NGsnt98xKOKNYScCyrRxmQ+N/RQUvkt qOAsvOVTqCiouuLjiWQyL6pMjF5aWvXu6wnhpV+f/OsREfDIjNonnuCEjP44QUegdJ11ks Eg7qTeYt+WHO+QxJsq2INI3yJL0e4KuATd6J/IQ+QQoasEl2ysjrTNBK14yMrqZlARif5r llj12dGEpTRImmEJpDI9j+wo86XvyxhVSXzEf8ZJ17jAS2WUCM10JQ/PO9vmBw== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:38 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-4-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=6485; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=+V6TwRpRcAHbLUEqC/uBzK12Y4oi9gShliHqWlvH39M=; b=YRkx1vJJTIiuhUm4CwsCEqAre2OALuwwGaZQwPRAa3Lnx5HhIaexokbf9UkUDZ345GNRojHl9 01Ddw7zTSPvDsGz09UYm3FAdrtiyrAnay5LBMzs35VYs0Pu07QOcctm 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 | 4 +- drivers/crypto/talitos/talitos-rng.c | 93 ++++++++++++++++++++++++++++++++= ++++ drivers/crypto/talitos/talitos.c | 83 -------------------------------- drivers/crypto/talitos/talitos.h | 5 ++ 4 files changed, 101 insertions(+), 84 deletions(-) diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile index fcc5db5e63c2..329a2be494b6 100644 --- a/drivers/crypto/talitos/Makefile +++ b/drivers/crypto/talitos/Makefile @@ -1 +1,3 @@ -obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D talitos.o +obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D crypto-talitos.o + +crypto-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 9f0928312102..b99092b5b59b 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 Fri Sep 25 23:11:03 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 BF4344A5C24; Mon, 7 Sep 2026 13:23:22 +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=1788787409; cv=none; b=WA90kAoOSfKjpLxQpXAJ3wRMyXRcZ0+P86yLQG+detSu9z0NloqPgI6UJhorR9KvrIwml3WARUT1jO2O8C6XYyqUsLu67xc4WYLZzILq2xsCb0RWSMVxVeWfKapaQqbsrFEV3jqEjXvlQKpLbtLeaQVq1Y+MVVE+7o+XP/bmDLU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787409; c=relaxed/simple; bh=J/c2ykvfKiLkStIFjeGrH3TDRHJ/OZmb8F2eg2DQ62o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P3vaBlcZkeF+xsk6zjKjmqcyVoa4E6zDMdJwuAHpclx4tI76iRO65aeTA9ookEa1RmT3rwGbd9E0dZ1jLqbuFnR/Zk0Z7uRzEqVE9g99ZB6IxEA0O6WTfV3RTZXqXw/PwnMWgxJE6zOpnvxiMEFdtv4HCUlyBob6diQjLSH9Hk0= 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=PBsDPEce; 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="PBsDPEce" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 60A0D1A1A3A; Mon, 7 Sep 2026 13:23:19 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 3600C60383; Mon, 7 Sep 2026 13:23:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E4D0D11C7AF29; Mon, 7 Sep 2026 15:23:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787398; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=o09swlzq2H25UhDumdjrGXZ6Jv6S22e2yyGSeNxrafc=; b=PBsDPEceTRLV4NkOjIH0PsqSi2M+x081h1iakOv6AZGpYztNvCAaaPO5Wy0QwYsK7SLSG2 WO2rt2n4itn6lf6cEVosaNxsxoUpMaEQdskhAHnPob4vzybn/1njmiEDxI+eFib1XW7wtX KlxCNrrWK87Otw6l8Z/bdVUq37PFrJwKlXhPmp0beR17/DCzAXhBDe3r6e2skdmjSvCEK4 J+OmF++YerQZ0vrUiVvnnxJ555RV9dZPTkSaqq/FUBpuvCGDYQ8mS1Yc+dYqS8L5471pqS y5i2oqbZWs8lOqIndDNacD2TEu1zwROBG6/W73Xi9qYgpYiJ1TiFcbSnenqw3Q== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:39 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-5-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=16001; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=J/c2ykvfKiLkStIFjeGrH3TDRHJ/OZmb8F2eg2DQ62o=; b=MvN/fr2sjn1k8bxmq5N4l8M64R71ytV1hkFK6QYdHhvMUxWoUtDIU5VNv6DWJf8VenpmkE8wl /Ik6jU5UkNcDnW+4H9phHqAekX+VnBtmSvJ0JYCkv/pcSHXppY2BsxV 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 b99092b5b59b..3aada129e904 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; @@ -2182,18 +2071,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, @@ -2996,14 +2873,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 @@ -3063,7 +2934,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; @@ -3077,7 +2948,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; @@ -3114,7 +2985,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++) @@ -3423,7 +3294,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); @@ -3434,7 +3305,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..24b4d541df2c 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 inline 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 Fri Sep 25 23:11:03 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 E84144E3799; Mon, 7 Sep 2026 13:23:23 +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=1788787413; cv=none; b=Bluju09gSFEGDRc5qkQ6R6vuG1V0gNJEw4uNEFexLd5iUV8/7Qg7DPTNEzQ48+TQQG2oqN98sT9uNI2GlcOTxEFAjK/fUJ2RehnRBDYdK1dmyYPxQ3RTbb3+9cdUD6mRpeCW3nFlxx56CJZxclne97j56fT2rOrR5c4J+/9sFs8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787413; c=relaxed/simple; bh=dvPYyEKdQaxHNgr2l+QOOi2o3SJsjPLEvkEvt9g79Nk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AO8BCSTCk7OeIc894sBSG3+o35p4enUb4fhZJJ6SFgIcMYYIzJDUiSnGshxmkYEMSFfG1Aa03u9HV8wGgOcri7MjkAUyC3r1Dpwdm3SBaRRP41YgnRNeG1QqgM5XNfxcRZTi/Cpne4SSU9Ju3l4+2IxSaYKW5cPOZTW6dz2RJyA= 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=yFCI3WWL; 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="yFCI3WWL" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 79EBA4E41572; Mon, 7 Sep 2026 13:23:20 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 4783660383; Mon, 7 Sep 2026 13:23:20 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D74AB11C7AF1F; Mon, 7 Sep 2026 15:23:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787399; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=FFVik2ik0sMlgJlug0D1lzU+pW/AA1ECf+ExGfCWvx4=; b=yFCI3WWLjXpVpnKqfQ0URnx82HldBOBnhuCUE5TIjnm2WrLx2JTtzivd5cG/1syonxpDTh 3rLXeBmWvpHnKsSNqYguH6KkgIK7kOH1DBqvGNgi3FkQu7g0MIqzAQwI0dP8TIRKOiwqUr DxQmvpzMaVUF+EqKq5JZVbmnjqpJJmDHhl8zATbfvfTKkD17O4p7/IsKqn792HQZWVhpPs NRvOeuQ3vReQ3WnjzgTlO2+QsnhYhEtg43a7DiCKy9H0dP0HJMLYAz3LX+/hBE7416R/0l tAKNo+StCP/09+nDBT1AY1z/feWejKkCnYKvs0oEGa30Tt/wfHLjVbEqfBt64w== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:40 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-6-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=57684; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=dvPYyEKdQaxHNgr2l+QOOi2o3SJsjPLEvkEvt9g79Nk=; b=7yvuaakrSnbo84l0bMdKhdmHW6keZv9/Z5At+5OuAIewycQfrHD/ylC6ESmLA2U/c6p1baozL cue7bxFfanNAiCL3m1W6w8Q5VStC9zr5uNG/96KeY0hmGu6dan01mPv 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 | 832 ++++++++++++++++++++++++++++++= +++ drivers/crypto/talitos/talitos.c | 857 +++---------------------------= ---- drivers/crypto/talitos/talitos.h | 7 + 4 files changed, 903 insertions(+), 795 deletions(-) diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile index 329a2be494b6..57e5cb3bf8ba 100644 --- a/drivers/crypto/talitos/Makefile +++ b/drivers/crypto/talitos/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D crypto-talitos.o =20 -crypto-talitos-y :=3D talitos.o talitos-rng.o +crypto-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..fb4af03bec69 --- /dev/null +++ b/drivers/crypto/talitos/talitos-hash.c @@ -0,0 +1,832 @@ +// 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 be_len =3D cpu_to_be64(req_ctx->message_size << 3); + __le64 le_len =3D cpu_to_le64(req_ctx->message_size << 3); + + memset(req_ctx->padding_buf, 0, sizeof(req_ctx->padding_buf)); + req_ctx->padding_buf[0] =3D 0x80; + if (edesc->desc.hdr & DESC_HDR_MODE0_MDEU_MD5) + memcpy(&req_ctx->padding_buf[56], &le_len, sizeof(le_len)); + else + memcpy(&req_ctx->padding_buf[56], &be_len, sizeof(be_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); + else + req_ctx->message_size +=3D nbytes_to_hash; + + 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; + req_ctx->message_size =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 const 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 talitos_alg_template talitos_alg_template; + 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; + + talitos_alg_template =3D hash_driver_algs[i]; + + ahash_alg =3D &talitos_alg_template.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; + talitos_alg_template.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, &talitos_alg_template); + if (ret) + return ret; + } + + return 0; +} diff --git a/drivers/crypto/talitos/talitos.c b/drivers/crypto/talitos/tali= tos.c index 3aada129e904..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,509 +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 be_len =3D cpu_to_be64(req_ctx->message_size << 3); - __le64 le_len =3D cpu_to_le64(req_ctx->message_size << 3); - - memset(req_ctx->padding_buf, 0, sizeof(req_ctx->padding_buf)); - req_ctx->padding_buf[0] =3D 0x80; - if (edesc->desc.hdr & DESC_HDR_MODE0_MDEU_MD5) - memcpy(&req_ctx->padding_buf[56], &le_len, sizeof(le_len)); - else - memcpy(&req_ctx->padding_buf[56], &be_len, sizeof(be_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); - else - req_ctx->message_size +=3D nbytes_to_hash; - - 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; - req_ctx->message_size =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, @@ -2654,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, @@ -2919,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); @@ -2999,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) @@ -3044,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); @@ -3303,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, @@ -3330,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 24b4d541df2c..99584157837a 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 Fri Sep 25 23:11:03 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 46E6247279E; Mon, 7 Sep 2026 13:23:28 +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=1788787417; cv=none; b=MuAZ27Uju2szU5GEfsvwGw45x855adHTi0bO3Sv2oimpnEhNGGUVjn/e2fsuS+id90ldp2rBfcgeLORKf0naFoFJcEi8vwMo9uZgiMxYw8bzAha/bwVTY+GAvoTQ/o9JUG0PLoRWe0UeqHA/VZEB4Lf/WzB8U+9kTl5mDKHxRow= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787417; c=relaxed/simple; bh=HjL6I4PfO3uMZc6p7k4femzo5LpVh0jz+2+Agv8AYMc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IYqvfWDByBZ4zlFyJG/u+5VFhfKZAmtXWeqlh/SvZsjzXSVwZ6ADfUR4tfMl97QAXr5vfzygmF6M8v0WK46xyPqfxHlGNZvHdmrcWF4cHVtbh3aOCrFWh2QBK04KGPqFerRnzDYa0p7hP3+E1/H/gr9A/Lt3TZRY+sDr7Pf1ft8= 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=kznKxntP; 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="kznKxntP" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 92AF04E41573; Mon, 7 Sep 2026 13:23:21 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 61D4B60383; Mon, 7 Sep 2026 13:23:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 03EEC11C7AF2A; Mon, 7 Sep 2026 15:23:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787400; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=f9cuOjTHfjHtQexMpDlaps6kaibVjMgPwqnXgaFsPEg=; b=kznKxntP46YwFnrCCzsE/fOArjRnzy6Z1hoEKOZg0+dwXQf3gcVvqY40yymtlnz2Ozc7HV p9qZloCRagIK8n+8VS0c25pjmP9P7wjMPkKmMiD1Jyd/NqdqZRt0kwaYAMGtXh218eR8kr 7PFi8msJu7sCEirq5MqAyWNMfSRevzltckTcUfkFfOSTWui4guaJy365wgKAo/yj1/9UTX 3RHYXo7mmoIe6uzGZMWmYb+BmyNqWZZyREOh6s70ZXlUi/Jwtv/oe0zHD1us9Wh96ZMVg6 rYFMXgXAqOsPFYjDOvYLUKA3SEF/AhEXvCoJwHwXNrrB5UBqac9LHEg18UCzlg== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:41 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-7-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=28588; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=HjL6I4PfO3uMZc6p7k4femzo5LpVh0jz+2+Agv8AYMc=; b=Qh6xQPDntcaJRGSUC1xDLTlQZI0KlvG2fwfg5JlCllT+fQYEqdY3j1opcYDhjVqyevQVPQc1L 6xaB9SEEGFiAG2iOIVJ8PD0sGmD7FLlwXjREKsTEvI2UxyfVW195J/w 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 | 402 ++++++++++++++++++++++++++= ++++ drivers/crypto/talitos/talitos.c | 377 +-------------------------= -- drivers/crypto/talitos/talitos.h | 1 + 4 files changed, 414 insertions(+), 368 deletions(-) diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile index 57e5cb3bf8ba..34f1871276b0 100644 --- a/drivers/crypto/talitos/Makefile +++ b/drivers/crypto/talitos/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D crypto-talitos.o =20 -crypto-talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o +crypto-talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o talitos-skcip= her.o diff --git a/drivers/crypto/talitos/talitos-skcipher.c b/drivers/crypto/tal= itos/talitos-skcipher.c new file mode 100644 index 000000000000..e4e8bebdfb7b --- /dev/null +++ b/drivers/crypto/talitos/talitos-skcipher.c @@ -0,0 +1,402 @@ +// 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 const 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 talitos_alg_template talitos_alg_template; + 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; + + talitos_alg_template =3D skcipher_driver_algs[i]; + + skcipher_alg =3D &talitos_alg_template.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(talitos_alg_template.desc_hdr_template) !=3D + DESC_TYPE(DESC_HDR_TYPE_AESU_CTR_NONSNOOP)) { + continue; + } + + ret =3D talitos_register_common(dev, &talitos_alg_template); + 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 99584157837a..07cdd6034883 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 Fri Sep 25 23:11:03 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 3984B4BD103; Mon, 7 Sep 2026 13:23:24 +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=1788787416; cv=none; b=FIpza/9dgZ6kIGAreeZuQ3nicTN5bBj/2k5+FDWJp1q+lVUhQGjdKtVZw1EzBK0R8DjDMNyCKYx4gpap1QePW9YiT4eTEeoy09f8CEIw9JapU2n1F8DF16bi5JpqSp4I4QIgYONHBiFiTosg97TGJX/ixY/1HSMes7DN2EJgOG8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787416; c=relaxed/simple; bh=QW8gKZvoOSjKCVvwZVO94BGnpErwHs1S3ptlEw4+ztU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D3Pjhl5+0L3AI/iQKx/n997g6n2AeO9TBCsDqpmuYYXmOVlgnFSNRlpXE3CjxcEyaeZDxTzAHoCCGpoeh5YX46PQgLyIzJcXXDZUj9SJyDverL3p4bqophMkU0mJpD7Jp9XZgIG79gkUa8pfxgiCmx4PdHgowTAGSic2say8Pog= 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=2PY28MNN; 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="2PY28MNN" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 9D6DC1A1A3B; Mon, 7 Sep 2026 13:23:22 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 6E8F360383; Mon, 7 Sep 2026 13:23:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1929611C7AF2B; Mon, 7 Sep 2026 15:23:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787401; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=G/VwYBvcRupj0IX6ya7j5ghoEbGos3tr6LPqaRo5WK0=; b=2PY28MNNgR4by9PGPTMndEuH1WSPpyKX9ezY+U1Yny8ygk/WxKKx20wrNEQfP9a7pl3zi0 BwKeojLuIwwQDj1g7NPdurISKJGMnfWzKRY0azxsHh+GQz+2Uk7gAox2fZ0HqSwuo88Gt4 FxiBoSWzf5rQGkbuhmUr14GlhSHdTo6w+T/fFBdPzQlip31xJWNXseuGmmCEWzroOYuW7G nDU5Jpo7TJgKGWW8sBKpGDvXQGlPS+UTXQ/vRSfE2zLQqQrY4Sbujo4nSs5Ac83rVgzva3 a4FKuqECAdRN3YSgCsN2cZQQKDzw+lr1vDCV/Tko4qAbEIWqfswF/S+iy5Z5dg== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:42 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-8-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=63555; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=QW8gKZvoOSjKCVvwZVO94BGnpErwHs1S3ptlEw4+ztU=; b=IFDfKBBe0ftmC0It4D0ND1Kk9Y6cmZF7db0PP5yz3YiyvZ+DMfcGheouAvuLAAEVaBsfxTTeI npCPSjhzfwxCBBv1MSxKtgoosEWgX67WAAvdbOJnIeIArBnJSatekhf 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 | 900 ++++++++++++++++++++++++++++++= ++ drivers/crypto/talitos/talitos.c | 947 +-----------------------------= ---- drivers/crypto/talitos/talitos.h | 3 + 4 files changed, 913 insertions(+), 939 deletions(-) diff --git a/drivers/crypto/talitos/Makefile b/drivers/crypto/talitos/Makef= ile index 34f1871276b0..dfe87bbefdf6 100644 --- a/drivers/crypto/talitos/Makefile +++ b/drivers/crypto/talitos/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_TALITOS) +=3D crypto-talitos.o =20 -crypto-talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o talitos-skcip= her.o +crypto-talitos-y :=3D talitos.o talitos-rng.o talitos-hash.o talitos-skcip= her.o talitos-aead.o diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c new file mode 100644 index 000000000000..0236f152743b --- /dev/null +++ b/drivers/crypto/talitos/talitos-aead.c @@ -0,0 +1,900 @@ +// 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 const 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 talitos_alg_template talitos_alg_template; + 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; + + talitos_alg_template =3D aead_driver_algs[i]; + + aead_alg =3D &talitos_alg_template.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, &talitos_alg_template); + 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 07cdd6034883..8aa3102e9935 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 Fri Sep 25 23:11:03 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 BEB734E80C2; Mon, 7 Sep 2026 13:23:28 +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=1788787414; cv=none; b=s5mlMdUWN1l7a/Rk6SU8lNJdL2ZIXCL90Qf50vrc0BnLSZcfW9upVkosYjLCX5qDDobNbejxKDq8TOgwLIONaZtmhMWxe+tgZHHgGl+KcV5OmRDaUOCYFN+p4QjqDAgoq5RRieIGeDfC93wiKQRAG5DwybdX2vBAKQFlkFAJc+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787414; c=relaxed/simple; bh=QPB30l6pOTb5cjOFkBtVbtlMonRMr6cNSW6KB+4/k8I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=o/ER0QmDtZFGm581DVo/nQJ6Gzpvx4yB1XB271TcYmB/MM667L4xLTO2gl0vvmAHAKFSlkV8UHFA3ilvnQGaCdi6nc/DQG0ItpmgCZWzS2p8ZMz0+0UcShcL81kXmAX0HVpDQU8vQFsBurXbCAOBlt7gJckDW2gOh478wEPNI0U= 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=o3/d/PJH; 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="o3/d/PJH" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 841901A1A3C; Mon, 7 Sep 2026 13:23:23 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 5938A60383; Mon, 7 Sep 2026 13:23:23 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 19F9D11C7AF2D; Mon, 7 Sep 2026 15:23:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787402; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Wg/hbB/aevRwusQ+tbFfw+UWBx2z9HVCOk8V2JP2Z38=; b=o3/d/PJH8TmWxDZLyeZ2NrOdSnWm745Q8lijDGI2tU9dz0Rh9hVq6LCyMYh9rmBaEZ/TIr 7rQPgFIHfHo1BVbGkOUNQ6Nw5VNzA50eh3tezLcUA+q7ZbzW2JMSKEQ1Bq17YedpK6buLI 8uH/OV6zeQF9vTLlHOM1jcOHsNWm+8I5oiD1t4/YFfnW94YbaCYGviU0jHNs+a99EJFBSQ zub8oAhp2gBa5BE6H2pQJ8GFtoB2wVszhh3XxeDABhjxORrfNk7utswQFYTv9KLiSzeROV vFH0325W607MAOBrLOjAoEDsV/S/HczPi/HGBhfg/EkkQyXnC1/MZ+SmpjG/9g== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:43 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-9-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=2077; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=QPB30l6pOTb5cjOFkBtVbtlMonRMr6cNSW6KB+4/k8I=; b=dLh3cTR/9/rerqybP3kAsNVoL6ybxMo/FBakkN3FipZ25zDVnqRKhF3gDdcRo3eNksa1tHhEY eG7JoMyQ7LjBQcGjolo9owbhP9zJK0TJiV5HV961o9taSqwGZyr4OFx 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 fb4af03bec69..4224563ac701 100644 --- a/drivers/crypto/talitos/talitos-hash.c +++ b/drivers/crypto/talitos/talitos-hash.c @@ -541,13 +541,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 @@ -556,6 +556,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 const struct talitos_alg_template hash_driver_algs[] =3D { { .type =3D CRYPTO_ALG_TYPE_AHASH, .alg.hash =3D { @@ -794,8 +799,8 @@ int talitos_register_hash(struct device *dev) ahash_alg =3D &talitos_alg_template.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 Fri Sep 25 23:11:03 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 570304E8DE0; Mon, 7 Sep 2026 13:23:31 +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=1788787418; cv=none; b=lHbZ4ISeezVyE49DPI7o43LSmvbBpDqbHk9IWePlFYECr8M9gZmNW9SQIN5H+DU3BeS8FiTTIungLyQgWxJp7A+ZQ8eYSrFC3EkAy7seoST5etp+/E2bYwrKIGfwcLgSwtl6xzkF5J+Xxzsvh0q7cs8uJVoQeZ5+GW0Iy0d0P3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787418; c=relaxed/simple; bh=tv/D1m+jWDZUaVM7vfSAa+Ud714zRZugQxwPlYEI8xc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rfEy36ylG4HibmtKoP/B6Q4A10dBQJLRcdlgk873lqMAYYrhPDKhVz/7UEU9W+kLa4JI+5ud8KelPhMX2GFAifRGDkYHHgl/DTQKFpD0/COqk1Mrp2mW2gqcPdB5BdG7xTzQoEsimZo2o4+lXOZRQCshvvd4Q2bjBAlphRoo1bg= 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=tnvG2urF; 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="tnvG2urF" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 721CF4E41569; Mon, 7 Sep 2026 13:23:28 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 40C3160383; Mon, 7 Sep 2026 13:23:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id F01D311C7AF2E; Mon, 7 Sep 2026 15:23:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787403; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=bcssHe3FUjbgo5c0WBhKNqn0JWGj8BDh2G8L/qXCQjk=; b=tnvG2urFs35wWX7GuHOj7KtdUSFAsLFlHzvmBfFrR3KbYxmGfC/463+fgTCBmFkQo9tLrE ZuYwr62508HXuHUO8fjz/v9jmUkHguTknma4LpyhfehQZBb4f2o0vNqG6f03rlz7+0Kikq VyjxB91BkNmBF7Dq5ZWY4Nadi5h0h9i8GoirG1fIi35a17sSAh4wxTJte2oTGHs4oExTTw +0080HQywxSCbR3CCxCYRT2keZ80QA0lHGpFS+7C2LW4hePo/mva3SpPZOkODFS5baMHsA R0RmAd2c9OTzu4HKP+jxQufAJxd/P7Zk4M5h/+2s+kBtspBPpsD9pg7rvHyaxQ== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:44 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-10-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=1565; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=tv/D1m+jWDZUaVM7vfSAa+Ud714zRZugQxwPlYEI8xc=; b=DjiEnJzwreOppXD2fgYy8BnmmvgbP7FxjBXyE/lpi9YtOZoDOs7IHBBPZxdLPYfEzkkxS6qB9 m85L3nQ9uyPB/d7ck85tXgofZxVzYq1Bmfd0eSRS5U6H3UFvWnYnw4I 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 e4e8bebdfb7b..6c60ad6aa9be 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 const struct talitos_alg_template skcipher_driver_algs[] =3D { { .type =3D CRYPTO_ALG_TYPE_SKCIPHER, .alg.skcipher =3D { @@ -378,11 +383,11 @@ int talitos_register_skcipher(struct device *dev) skcipher_alg =3D &talitos_alg_template.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 Fri Sep 25 23:11:03 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 428914E8DE4; Mon, 7 Sep 2026 13:23:37 +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=1788787423; cv=none; b=qTQRho+SJfrHRne63UMvHFrPOlWAniCf8hLLmAUScG5vrbI0QSPSjTYPv2fqh0sM40d8wC2kQbdfkJRKMi3sYhAhBCQBYwMhVat/GlMKoUsUSzkJeXwgEVpPNfwh5STxjIDmOMbsJobMKsa62L00DFGDMvga93qFNpqG3PxITZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787423; c=relaxed/simple; bh=vQcKrYP6k0j5wNodab0zb0g+Xj+k54TiujSaCIm7m8g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NU5rESdUzCTSsLHFag9YrzObayjcWck7J1WYhVP36G39Onlvs0fZWio2fUsQospiI0/OhvhZqkg1UW4bk9azB4NNDpKuO4ljRNBesJzb/Tjj5YgZti0LxGjB751QHwoqpETB7rae2iZkBN2y5iLaqKeOHRFBDEg0CMVIjXHOpZI= 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=uO2oPj7T; 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="uO2oPj7T" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 76D231A1A0C; Mon, 7 Sep 2026 13:23:33 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 4B83D60383; Mon, 7 Sep 2026 13:23:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id F0BB011C7AF31; Mon, 7 Sep 2026 15:23:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787408; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=HlsWSVvNlE3rAAAwzxFjv9sOhP6ooQFClSUhAwaPBys=; b=uO2oPj7TiCkECbuZVecyWZL04j2WqDVkvoIlVerd9Y1eKHSfQsMZGVWX4rmHEdfIxYSJkS VbsMHiea1teg0uRqe4T7qGFu99DthG17+L01HPTG+aLtFE0d5ak3qMxcIzlKTdS+o9DFBu ym1C3+wF9mgflpA2Xs6r8mWTbj0nK3inZsm7MFd2LzCn3My6LFoCrOMsSeOVsaiJtdcTpb TQXbQz6MnHZ5x7HPGbD4jRil6Me3IOjGP+uomY9fcG1FPbNFmwv141nmJkNQpqJV9u2+gb 69yrBZFhw5lR+xNf13wIqPiw860++TlhJ3HGVETECXVsz8o08Gz2GyB4k/xbzQ== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:45 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-11-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=1453; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=vQcKrYP6k0j5wNodab0zb0g+Xj+k54TiujSaCIm7m8g=; b=OFhapBktKO965rh/uftg63zxMJx6ZbSRh4yD+LRiTry1UFBJjjReBtaxyr6oK3lqbls2qeyMP /GvWGWSbQl7AssoZcwpmBPR4c9UMhGcYY9spC29vD2C8joFjGy7paUv 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 0236f152743b..40d048de0502 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 const struct talitos_alg_template aead_driver_algs[] =3D { { .type =3D CRYPTO_ALG_TYPE_AEAD, .alg.aead =3D { @@ -878,11 +883,11 @@ int talitos_register_aead(struct device *dev) aead_alg =3D &talitos_alg_template.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 Fri Sep 25 23:11:03 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 02A584EC640 for ; Mon, 7 Sep 2026 13:23:42 +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=1788787430; cv=none; b=FS64cmZwlw28LYltsFwl9M64wgOWCtO0ee+t7DTk46Jgwwv9SpN89BJhYsNwq/JsghS175qbXgyqywfSVZGG07D0wvoPVsNk4OkKXm+5lkRTj1mst5fwmboiAUSxR59cZSKmaS2DzKm1qkYl05GtP7na6IP17MQw/6420NYMYxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787430; c=relaxed/simple; bh=omYJ9qYzU/QEfBStHEzGw53Ud0NO18760mQ77Yxhzgs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PhCegEodo3WpsTH40lPyVg1V2JZlAlVJOsXdmRdpMytXx+wQuWpj3UBlKHJ1DvUcN0BpnIlfUkzhpV2OLZULjB/Ex3TKHp8mnn5LPReiX9Yu6e9EK7xS/7k1Tqx03qO+fPOLOCbpQ91saEFnYX79SqaHzonERK3RS16d5hCCebI= 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=ROZUYLZD; 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="ROZUYLZD" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 582F41A1A33; Mon, 7 Sep 2026 13:23:38 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 2D44260383; Mon, 7 Sep 2026 13:23:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id EBFF711C7AF1D; Mon, 7 Sep 2026 15:23:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787413; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=lSLvkGWLl5t5FA6v8LOlMVengpBcacv7JAWtziZeGX8=; b=ROZUYLZD4Aj6VYxZFGRenkyeuPi17QfS9P1rTwqiTDM+2AJ1aw1DBJYyNyGzcaDtkReDGS GoUrv625cMJyEQmo0uEdKprzmnVounSUQotUb/JbHyMZREWpcbTZnJEwiTEMZAcMqDXfPb VGGaS6Cpq43kyt8ayKMdeF7+y4AbsrhX0s0C8ES2A+lZ2MtG1CYsxDGbivnDNruGDP1IFC jHc/SL22Nb0IGHxxsUaxh4kbmlQy+hDUV7tml5f1MbisDcNLjItnEtm46nJixIrYxX2Hen Z5QrtEH++8bBoVjwXZ7Dt+UXrSzMZovN8Eav60YPiy6YrBoMRUxPelw8QBSkpA== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:46 +0200 Subject: [PATCH v5 12/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: <20260907-7-1-rc1_talitos_cleanup-v5-12-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=22584; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=omYJ9qYzU/QEfBStHEzGw53Ud0NO18760mQ77Yxhzgs=; b=GtECWhVDQaGjGxmHbq87JeDb47FE3Mq+hvlFSf64rvInp9oO7DKSHB75vy1kkAWfnB0KlreyN Rj85w6a/72uDqSBCUpnEfPNd451PjiuJjZJ+muHrliVjt0m3lVwaibe 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. --- drivers/crypto/talitos/talitos-aead.c | 128 ++++++++++++++++++++++++++----= ---- drivers/crypto/talitos/talitos-hash.c | 72 +++++++++++++++---- drivers/crypto/talitos/talitos.c | 23 ------ drivers/crypto/talitos/talitos.h | 1 - 4 files changed, 160 insertions(+), 64 deletions(-) diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c index 40d048de0502..0504b8575e26 100644 --- a/drivers/crypto/talitos/talitos-aead.c +++ b/drivers/crypto/talitos/talitos-aead.c @@ -413,7 +413,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha1-" "cbc-aes-talitos", .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -428,14 +432,17 @@ static const struct talitos_alg_template aead_driver_= algs[] =3D { 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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -457,7 +464,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha1-" "cbc-3des-talitos", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -474,7 +485,6 @@ static const struct talitos_alg_template aead_driver_al= gs[] =3D { 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)," @@ -482,7 +492,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha1-" "cbc-3des-talitos-hsna", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -505,7 +519,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha224-" "cbc-aes-talitos", .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -520,14 +538,17 @@ static const struct talitos_alg_template aead_driver_= algs[] =3D { 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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -549,7 +570,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha224-" "cbc-3des-talitos", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -566,7 +591,6 @@ static const struct talitos_alg_template aead_driver_al= gs[] =3D { 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)," @@ -574,7 +598,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha224-" "cbc-3des-talitos-hsna", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -597,7 +625,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha256-" "cbc-aes-talitos", .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -612,14 +644,17 @@ static const struct talitos_alg_template aead_driver_= algs[] =3D { 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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -641,7 +676,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha256-" "cbc-3des-talitos", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -658,7 +697,6 @@ static const struct talitos_alg_template aead_driver_al= gs[] =3D { 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)," @@ -666,7 +704,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha256-" "cbc-3des-talitos-hsna", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -689,7 +731,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha384-" "cbc-aes-talitos", .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -711,7 +757,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha384-" "cbc-3des-talitos", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -734,7 +784,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha512-" "cbc-aes-talitos", .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -756,7 +810,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-sha512-" "cbc-3des-talitos", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -779,7 +837,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-md5-" "cbc-aes-talitos", .cra_blocksize =3D AES_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -794,14 +856,17 @@ static const struct talitos_alg_template aead_driver_= algs[] =3D { 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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D AES_BLOCK_SIZE, @@ -822,7 +887,11 @@ static const struct talitos_alg_template aead_driver_a= lgs[] =3D { .cra_driver_name =3D "authenc-hmac-md5-" "cbc-3des-talitos", .cra_blocksize =3D DES3_EDE_BLOCK_SIZE, - .cra_flags =3D CRYPTO_ALG_ASYNC | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, @@ -839,14 +908,17 @@ static const struct talitos_alg_template aead_driver_= algs[] =3D { 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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY, }, .ivsize =3D DES3_EDE_BLOCK_SIZE, diff --git a/drivers/crypto/talitos/talitos-hash.c b/drivers/crypto/talitos= /talitos-hash.c index 4224563ac701..3cfa739dab64 100644 --- a/drivers/crypto/talitos/talitos-hash.c +++ b/drivers/crypto/talitos/talitos-hash.c @@ -571,7 +571,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -589,7 +593,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -607,7 +615,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -625,7 +637,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -643,7 +659,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -661,7 +681,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -679,7 +703,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -697,7 +725,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -715,7 +747,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -733,7 +769,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -751,7 +791,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } @@ -769,7 +813,11 @@ static const struct talitos_alg_template hash_driver_a= lgs[] =3D { .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 | + .cra_module =3D THIS_MODULE, + .cra_priority =3D TALITOS_CRA_PRIORITY, + .cra_ctxsize =3D sizeof(struct talitos_ctx), + .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | + CRYPTO_ALG_ASYNC | CRYPTO_ALG_ALLOCATES_MEMORY | CRYPTO_AHASH_ALG_BLOCK_ONLY, } 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 8aa3102e9935..c2fc71282c0b 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 Fri Sep 25 23:11:03 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 5F2284E80B4; Mon, 7 Sep 2026 13:23:47 +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=1788787435; cv=none; b=P5upug4r+OgXbRegt5KVN3JS+5d5WQus9R0k6HiGVj/J3W4KaL1eFERNKbDycBCSPtlmE+CkcaeiNgNGlyJiSx+VFNY1UlmBvJpL+JMmgXF2LOr34rBl7T76aQG7zBitxoVU0slvfET736f4VMkyjk+C9jSROY/Pu8PmTuc+XIQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787435; c=relaxed/simple; bh=PZ6wssFg/kk7/ebPKx6ZwoL6iQ38/wrqTcXyNMXgE9o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SZruJBHwsRqjWGXN9WICDox74hWMRcvKG88PNJRJpumk6wbunfBkwIk2+qOuo0s8ek5fsaAYQbH8Er/aiHvLZ4xTQg2qWCashojNe+gepQRDmQn5/6cB74kVf9wFWwCSUxeFwrz0o7m0fihYoWLcQ3YI690kcQo/k7kMhfBVrVw= 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=EEs6bORV; 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="EEs6bORV" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 48D941A1A34; Mon, 7 Sep 2026 13:23:43 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 1E83360383; Mon, 7 Sep 2026 13:23:43 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E112D11C79257; Mon, 7 Sep 2026 15:23:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787418; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Ah+jyGeqYgfsbusugUY/B12VTUYA2L7ZAotxb8cKmZE=; b=EEs6bORV5DFZXqZNhnLFhbdCGKcBzl3qY4xAuj1AV4E4akiNlpZ74t3Cz5Fbz5O794vGJZ 6v4rmjX3Vl/7jl//wO9ICr7fJ5hgDxOsAmYC5NuggkksKpXB8/oMwaMhceelQD523r4GF0 BMqU/sPvnumvIkvTLpffuDE7FRDzYZ1r/6ODb98E+zp0twWB2MmCWlrlk4gANnfwfpU0y2 7C9C2X5DXGSvGyfPVxLf8dR3cks1r/7fiQo4qJCqCVdI6L3LYJnrsOqi/hMTppwKRrCPFO IiLos2+yA09F+rMzTzSlxnPIg0wv2CXPl0KvKvpUBBlqqe5xb7n9wS+u3ugz7g== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:47 +0200 Subject: [PATCH v5 13/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: <20260907-7-1-rc1_talitos_cleanup-v5-13-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=15357; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=PZ6wssFg/kk7/ebPKx6ZwoL6iQ38/wrqTcXyNMXgE9o=; b=b/I/NlY1XzT3+xTNyJ8iEsnG5nOZaVw+pGCf+2LvdbHf0aHUefxj43C/ke4z20kHY4FhBdotk fKEbY3bVjDFCvhQz8IRZrBKx3RxPIrZvS6MFQHGd1m8bZCtQ3wxWmDE 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 | 380 ++++++++++--------------------= ---- 1 file changed, 104 insertions(+), 276 deletions(-) diff --git a/drivers/crypto/talitos/talitos-hash.c b/drivers/crypto/talitos= /talitos-hash.c index 3cfa739dab64..455c751b9073 100644 --- a/drivers/crypto/talitos/talitos-hash.c +++ b/drivers/crypto/talitos/talitos-hash.c @@ -561,271 +561,111 @@ static void talitos_cra_exit_ahash(struct crypto_ah= ash *tfm) talitos_cra_exit(crypto_ahash_tfm(tfm)); } =20 -static const 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, driver_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 driver_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, 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 ")", "hmac-" name, \ + digest_size, block_size, \ + desc_hdr_template, ahash_setkey) + +static const 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) @@ -847,18 +687,6 @@ int talitos_register_hash(struct device *dev) ahash_alg =3D &talitos_alg_template.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 Fri Sep 25 23:11:03 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 4CC6D4E13FF for ; Mon, 7 Sep 2026 13:23: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=1788787433; cv=none; b=oR02RYM6A14a7Mpu+2+eIsznH7dx+ohNo63pxQc5kVi2KYMVwXdMjLjrnxTlqAJJRECovsBf8Jly9AebViAHt7LN7ErLoqRvRlc+2M3bH2exhS/kzFiW9mlSYRjdOvH55qFkv/8jouyZqr3DAiIiFl9i5El9IDrnZ/JE+GJSoco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787433; c=relaxed/simple; bh=brEGUYZKaNNO3u6r1PMA7TjGMwU57Zrw9OoF9YO2U04=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jl46ZUpNo5o/J29zey1U0RpFmVh80+1i8OfwSuNSE1AfsQw4U/sY7KOh+mDIhtcHZSLIV/CLb9soq5GQST+VcqhFvZTI3iaP9RWudwSnwNgsKgyV+QlnZL4bPq4Iwq39NVBfSAqK96MdF2H75rp6gZTLx4N2HSmTj+4OxEx4/DM= 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=AmyJ7Zv+; 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="AmyJ7Zv+" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 8C0851A1A0C for ; Mon, 7 Sep 2026 13:23:44 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 60FAD60383; Mon, 7 Sep 2026 13:23:44 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id CB68411C7AF1C; Mon, 7 Sep 2026 15:23:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787423; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=qb1wUb4EMthjmNfom9HtvCpm5Q01NkTLeocM6P8AyjI=; b=AmyJ7Zv+gl3OdnQlHk3Zj0nu6FSCBRDxpLih+lo96qgw9CM9xCTORwicVYIHNyge6ADFU2 HA+6c52lrEcR1hsrJ7MwC0wA+Ugu4FkoitdjRTqyQw7rDYv55aM1YtZqtX0GPb82YcyC5A 18/py+dxY/soqi8yFHp2O1miQMoJBm17LPczIN6V/g39EheKqxvSAW4opvdy4/24xs1ktr 59mlOWl08PYC7G984zf0GnSbkkPXUGrizLUFS6kWY6FeR26Tu5ygY2PjcVYAGShlEFO9Gr leTu1HVT4mtQ3j/OtQko9/fY4t1cgnWS2XEwSJUSXbBaZCBPQuq35KI+2CZ0/w== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:48 +0200 Subject: [PATCH v5 14/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: <20260907-7-1-rc1_talitos_cleanup-v5-14-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=9109; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=brEGUYZKaNNO3u6r1PMA7TjGMwU57Zrw9OoF9YO2U04=; b=8V8yJzEElf0KS9muQZpIUATcQKblM3D+LZLGldyUqmMgxz+LLfe0EvfU1hHk570BZbq3RvV+j 6u1EdIryXyNDb5lD+sC/Jxz7I2BU6k5pgdNVWbuzSrHXtCsNsp/ONef 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 6c60ad6aa9be..8360181840f6 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, driver_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 driver_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, driver_name, blk_sz, iv_sz, desc_te= mplate) \ + TALITOS_SKCIPHER_ALG_COMMON(name, driver_name, blk_sz, iv_sz, AES_MIN_KEY= _SIZE, \ + AES_MAX_KEY_SIZE, skcipher_aes_setkey, \ + desc_template) + +#define TALITOS_SKCIPHER_ALG_DES(name, driver_name, blk_sz, iv_sz, desc_te= mplate) \ + TALITOS_SKCIPHER_ALG_COMMON(name, driver_name, blk_sz, iv_sz, DES_KEY_SIZ= E, \ + DES_KEY_SIZE, skcipher_des_setkey, \ + desc_template) + +#define TALITOS_SKCIPHER_ALG_DES3(name, driver_name, blk_sz, iv_sz, desc_t= emplate) \ + TALITOS_SKCIPHER_ALG_COMMON(name, driver_name, blk_sz, iv_sz, DES3_EDE_KE= Y_SIZE, \ + DES3_EDE_KEY_SIZE, skcipher_des3_setkey, \ + desc_template) + static const 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)", "ecb-aes", AES_BLOCK_SIZE, 0, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_AESU), + + TALITOS_SKCIPHER_ALG_AES("cbc(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)", "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)", "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)", "ecb-des", DES_BLOCK_SIZE, 0, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU), + + TALITOS_SKCIPHER_ALG_DES("cbc(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)", "ecb-3des", DES3_EDE_BLOCK_SIZ= E, 0, + DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | + DESC_HDR_SEL0_DEU | + DESC_HDR_MODE0_DEU_3DES), + + TALITOS_SKCIPHER_ALG_DES3( + "cbc(des3_ede)", "cbc-3des", 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) @@ -386,12 +344,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(talitos_alg_template.desc_hdr_template) !=3D DESC_TYPE(DESC_HDR_TYPE_AESU_CTR_NONSNOOP)) { --=20 2.55.0 From nobody Fri Sep 25 23:11:03 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 70FFE4E56E7 for ; Mon, 7 Sep 2026 13:23: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=1788787437; cv=none; b=erFmyKAizDatCP/wG/rQ3IW+824XCX/z7uM4mRPV5hklS9NbTszSywxnCHTSo1uFxtB7LFAZLBNBwCQPUjVLnQ+845ivGbwSzCalV5H8z14eBrn4GDuSIh5v7WS/QxubPam/hUj6XcDxiGPSPwvMRWIb5kZFHNqL8yrkOaB/Vgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787437; c=relaxed/simple; bh=yl2oSYq28HHoD/I6T9naGGTG/87ynXJdLMVArr7HCWo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jyK4AouoFbra/x9aa0F4+qfQJb1Y6FnFbP9OYGhsU8V5S+Fxu29vGs9n3WE1mu6rbWRA4NW46t+URWT+KXrOfax+P6gjRokPt137D/7qPp1Vf4TZ5tKtlpI//MnZNLTXbdQgCg4YpdBB6nceWrvYFl1eopc4g3ppTo6zox0Q6KM= 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=1EUu9Etf; 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="1EUu9Etf" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 6D2511A1A36; Mon, 7 Sep 2026 13:23:46 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 41D6860383; Mon, 7 Sep 2026 13:23:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0245411C7AF1E; Mon, 7 Sep 2026 15:23:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787425; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=MRvoC/SHMN8glx1Jk4i2Iutk0etKiEBMqe8UEKp/XJs=; b=1EUu9Etf8K9s+ibK8FSFcMYcp+2a4csv5rxFqWKERzPPcZWgNOg8D02GQthU7JAXZTmwNp lYuaohaxibAIXg71kst4k1qZqtog0kE86gPcJh7CcHpOdhm5krBclb+vC2kBZDq4R/h4eu s5TZQj4TsFIYX+wcRnUELIfxP0YnsAwf1NRUqzFIkbqkdzt9F/q5wuAGmGs4omkKbksomH +eOG3SG5FmV6y8i2Gua3TuMu4/i7GvqF2+JYVCj56rPQam+mabrReUJGLMlFTJZvIGjFGY ZXuWESoIwGOnMkz32Y9/zW6NyT2b8m4d5ZodSNNHiU1/R1GGwOevnZrK1hsqDQ== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:49 +0200 Subject: [PATCH v5 15/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: <20260907-7-1-rc1_talitos_cleanup-v5-15-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=28746; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=yl2oSYq28HHoD/I6T9naGGTG/87ynXJdLMVArr7HCWo=; b=hpuCMBy6nWu4k194NGYuUDwU4o0etDYmkGT8TjdyFvwKZrVRzIwPRP6anpg6TjZXwkDdXNnuK IqVJ/EyDpyTB99uDinm+4eb+12D2jXuqX2QWx5/55PCA87F8BFzUqBj 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 | 771 +++++++++++-------------------= ---- 1 file changed, 238 insertions(+), 533 deletions(-) diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c index 0504b8575e26..60bc727f76dc 100644 --- a/drivers/crypto/talitos/talitos-aead.c +++ b/drivers/crypto/talitos/talitos-aead.c @@ -405,535 +405,245 @@ 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, driver_name, name_prefix, set_key, b= lock_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 driver_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, driver_name, set_key, block_size, max_auth_= size, template) \ + TALITOS_AEAD_ALG_COMMON(name, driver_name, "", set_key, block_size, max_a= uth_size, \ + template, TALITOS_CRA_PRIORITY) + +#define TALITOS_AEAD_ALG_HSNA(name, driver_name, set_key, block_size, max_= auth_size, \ + template) \ + TALITOS_AEAD_ALG_COMMON(name, driver_name, "-hsna", set_key, block_size, = \ + max_auth_size, template, \ + TALITOS_CRA_PRIORITY_AEAD_HSNA) + static const 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, - .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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, - .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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, - .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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, - .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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, - .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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, - .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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, - .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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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, - .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_module =3D THIS_MODULE, - .cra_priority =3D TALITOS_CRA_PRIORITY_AEAD_HSNA, - .cra_ctxsize =3D sizeof(struct talitos_ctx), - .cra_flags =3D CRYPTO_ALG_KERN_DRIVER_ONLY | - 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))", + "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))", + "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))", + "authenc-hmac-sha1-cbc-3des", 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))", + "authenc-hmac-sha1-cbc-3des", 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))", + "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))", + "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))", + "authenc-hmac-sha224-cbc-3des", 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))", + "authenc-hmac-sha224-cbc-3des", 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))", + "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))", + "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))", + "authenc-hmac-sha256-cbc-3des", 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))", + "authenc-hmac-sha256-cbc-3des", 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))", + "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))", + "authenc-hmac-sha384-cbc-3des", 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))", + "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))", + "authenc-hmac-sha512-cbc-3des", 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))", + "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))", + "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))", + "authenc-hmac-md5-cbc-3des", 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))", + "authenc-hmac-md5-cbc-3des", 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) @@ -958,11 +668,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 Fri Sep 25 23:11:03 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 797F04F55A7 for ; Mon, 7 Sep 2026 13:23:50 +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=1788787438; cv=none; b=qEORKG8Aar3HnMFinJXRFuy+3W+DIvvGfM+o6T1SyiroLMke8eJ3FQtxmsc271HAGN7KBamM+3U7kn74I/jdmdljW9JBCP8LOXTs/ao4lWeqBJ4z0+uqAaG/F+PnsqBemMCCIaFtuRe9PwW6eF9qQf5uAw9tSnAIgMXfcJU25GY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787438; c=relaxed/simple; bh=vFSTLNRrZ6eLdKlszPb1mYsHg7VDedLTdmgCk0wKe9c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qnnerUTf6awG5MVBbJNLFVhToQ5ptihsfg7y5MmlgZEm1ucosUi0g1FbNfl7lxuazgs3uBVYSQz28koUsXbzCMhEAOh/RK30Ul3fP5HjPMcpwRLKRQ1p7wzJjRAc/yYtsI85F0N+4C1iq5kbPHy02g7U320rrL4v1Qk0CM7Jc9M= 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=HJ1ZpOx5; 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="HJ1ZpOx5" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id 740C84E41570; Mon, 7 Sep 2026 13:23:47 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 4993460383; Mon, 7 Sep 2026 13:23:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E9FBC11C7AF29; Mon, 7 Sep 2026 15:23:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787426; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=BYLQVfrm2gGmdLutl+qbsE6ahiX0VvgmjHbvQAFG68E=; b=HJ1ZpOx5/bwOM56YaBmWZb5oA9WmWob8osydVRq3miOuYZ/ebq7AE5tJUHjI+TDfs3sm1+ BEDDPS7dWrnaMJxc0VY74cRs0401M4l8PhsUan7EYK1xsL33nFLNndii2M+XDRYjhsJ3LE SWYFZqaLOpiz4zfT8FmDLXyyFfCZ8zGkpWe8ASvgSEzTWnclw+62RccJs7crBY9j9MALuf i380yK/xyzkz+0lSRPYw7nsvzlT/Uk0Sm9oqAva8Ok2b+fl8fW4VGaJdamSguponFlGZLE hnseZHhJyBIbY6QvJqzAWZHxu68KkSOAE4wDO2gS1XhW8rkzXyDhwcXv7qo5DA== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:50 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-16-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=2752; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=vFSTLNRrZ6eLdKlszPb1mYsHg7VDedLTdmgCk0wKe9c=; b=ZDfQinRIoEGdzPt+hCwBkClk+y+TVMlW3M8Cvfp4TC8i2JBaasezm4sJEqV1MAyWgjsrFlKey nQp25ceq/tZBWX2bw3x3bcOwkemxQCHcrYeVijLYAirq0bBo2LGPw9J 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 c2fc71282c0b..5927dfe84770 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 Fri Sep 25 23:11:03 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 966972D949F for ; Mon, 7 Sep 2026 13:23:52 +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=1788787442; cv=none; b=RJu15H7+oyvExmzaeHkxVKW+83kcRTv9DwTSRFc9mnXkS81Xv/SVuhYNOMDGAZlZgI5Afs427vxLto/OvJ1oSiL2NveemMNBmwcjAh7X6ZA1njYL0M9LdeDs/Ib8jDW9soJsU4sNrLi0ilWgyY84vhxH4+zJNL/oeDzad0Rhh+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787442; c=relaxed/simple; bh=NRHqMeL3fXNuGzpHCimj4Dc+hsjRNcdqZOM2dU31+R0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rpbkSYR7EG8qp1EcE3MSf5pAhxwiqNPSRvLitev0YEeDZ+2hKJ8j0RMGQU/i2mmVMJaPYwQ9N9ssi/59IMS+MgoPvkie2rBzm8lW1qXaPRUl+Sqw4F182dRqPeD5CsapvWtpBojGsF4C4AaGWUMvpWzGhhv+7KSFqFUUY/aHjpA= 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=yYxLkP6w; 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="yYxLkP6w" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 91E921A1A3A; Mon, 7 Sep 2026 13:23:48 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 66E9760383; Mon, 7 Sep 2026 13:23:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0140711C7AF2A; Mon, 7 Sep 2026 15:23:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787427; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=RaObhND0g2j6RjFowkpYzGtdGHdm41rNlPxMLsqqsIc=; b=yYxLkP6wIO26q2ituEBRZIaXqQ6tT1gpsNcYL/9pv7BhV9VYKPVce5rXcxveG+5U6NF8Ox 2ltcDwNhVmlayuddhUUKZtMEQxcq8konZT7NeAxZZQC9s+cmo0B5gsQaB86/z/Sz73m+al o9ml2iBPBvFfnTEkB32HARqJDfCabH8X76I/M4Pq483w2zTwIQU1/iPqvdCkuaws1v+fPZ yB91uFPvjbV2aHXDJ3TlnH7mPyAxFR7/62TeljldFobmDYYyw2TzZxRaUO9dUNmlCC7as2 g2n0pJsMPjqmEtXTKBWZwz9G+6tAAp9xrs+lVC900v0GLysj9k38YxcCqiLZQA== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:51 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-17-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=28993; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=NRHqMeL3fXNuGzpHCimj4Dc+hsjRNcdqZOM2dU31+R0=; b=y8dno3V2Y+laeHuJI6C9dChyxe9ZMkajDPP41H70x/u5o8kiwISNhmKZmK3gc9RsI8Gmvfv6m V7f7ZAOkEF4ClKKIAvjIyClqfNnVMBh1AQi+f6MMgk+/RvomdDBf4pz 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 60bc727f76dc..d8058e75fb31 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], @@ -665,7 +663,7 @@ int talitos_register_aead(struct device *dev) aead_alg =3D &talitos_alg_template.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 455c751b9073..b938f0d4a901 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 { @@ -153,8 +150,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 */ @@ -172,11 +167,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); @@ -204,7 +198,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) @@ -225,12 +219,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; @@ -275,7 +269,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); @@ -301,7 +295,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; @@ -317,8 +310,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 8360181840f6..d4762873d0cd 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 const struct talitos_alg_template skcipher_drive= r_algs[] =3D { =20 int talitos_register_skcipher(struct device *dev) { - struct talitos_private *priv =3D dev_get_drvdata(dev); struct talitos_alg_template talitos_alg_template; struct skcipher_alg *skcipher_alg; struct crypto_alg *alg; @@ -341,10 +338,10 @@ int talitos_register_skcipher(struct device *dev) skcipher_alg =3D &talitos_alg_template.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(talitos_alg_template.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 5927dfe84770..a639c2f75d35 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 inline void __map_single_talitos_ptr(struct dev= ice *dev, 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 Fri Sep 25 23:11:03 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 0F4A54F6465 for ; Mon, 7 Sep 2026 13:23: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=1788787446; cv=none; b=YEXW6vuwIVIzNMx3PX0v4XIXZL34k5efL0P90a48JCS8qFuUskTKaH3X4p7i+Sa7Xw9Eujj9HK5vYcbWii9wLQb2FiiRH32KKcNDSmojqQMzY45Qli6D//8R+Yk4H6I/kv+7/r6XsTxKxboLAd6B0jhRPFmU9yqtKW00bnDYvTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787446; c=relaxed/simple; bh=5jnopsZPKCm0t5p+1wkdqP2FBk4NfItgNyTwn2G0Vvs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cjTDSv3CiYqlIqYFYBOwZSpsRlHn4Q7ZY/SmYC1GeZMuNxN7HiPq00FjDmeFFcDN2juHC7tVgK81E2u3GYRbqcfJi50I87UZ7TFnJDCfFq9DhFnHaCs+UkDJ/iduWqt848F2hiWvpA1fv/PX7+WRnrr9b0zs3wH7mMl2xxaBpR0= 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=WxShlsPW; 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="WxShlsPW" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id C10604E41571; Mon, 7 Sep 2026 13:23:49 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 96C8660383; Mon, 7 Sep 2026 13:23:49 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1344111C7AF23; Mon, 7 Sep 2026 15:23:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787428; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=wC7venMkj/RTIFOLgqj2INaaYVn1oEIURgzyjX/aewM=; b=WxShlsPWxx0/GHAO1caG6HdsWc41XRAYza4661rQw3ovQM6GSHdRMstbqWaLE62D3QFcOv 1132efXjD99urqE7zdVf8U+hyaVGa1hI+guhRJPRPLbGwYY/u+iqaN3CLn8D3wPoMS0KDF 6dDinh4Z9xyZsiLV7u97549sicd1DE+XDiB0zrrEGxVuIs/IpS4OnF+Ef0Z2PD/cv8QpKr u6fQXb2rTjvTq4ak8SRDqssDFWwmy41mD/ECQnJcqJsQOSoTVhtcyKHc5ijoMpugrF/ORY Cuq1ILFqI+7rFjZJuk5eYJdHrJW9IH9/3gUZUR5nJXpn9XWVjxTQHd5V/8vG3g== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:52 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-18-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=24449; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=5jnopsZPKCm0t5p+1wkdqP2FBk4NfItgNyTwn2G0Vvs=; b=nE72gnTLJzY2eWCr2ZAmC6d5iH3u5lvNmpSTY3t8s/2Dzfo9j8CkjCpmiV2qRYuFig6GrjdiH PqDkqVR0rbpDCc55ELHlE+KTitUNSnI2vrgt7LNvBTWUuk0/eQniLr/ 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 | 36 ++++---- drivers/crypto/talitos/talitos-skcipher.c | 27 +++--- drivers/crypto/talitos/talitos.c | 20 ++--- drivers/crypto/talitos/talitos.h | 131 +++++++++++++++++++++++---= ---- 5 files changed, 163 insertions(+), 93 deletions(-) diff --git a/drivers/crypto/talitos/talitos-aead.c b/drivers/crypto/talitos= /talitos-aead.c index d8058e75fb31..df0b4765986b 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 b938f0d4a901..edc6825228ab 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) @@ -130,12 +130,12 @@ static void talitos_handle_buggy_hash(struct talitos_= ahash_req_ctx *req_ctx, =20 memset(req_ctx->padding_buf, 0, sizeof(req_ctx->padding_buf)); req_ctx->padding_buf[0] =3D 0x80; - if (edesc->desc.hdr & DESC_HDR_MODE0_MDEU_MD5) + if (from_talitos_desc_hdr(&edesc->desc) & DESC_HDR_MODE0_MDEU_MD5) memcpy(&req_ctx->padding_buf[56], &le_len, sizeof(le_len)); else memcpy(&req_ctx->padding_buf[56], &be_len, sizeof(be_len)); 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); } @@ -156,7 +156,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); @@ -167,7 +167,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) @@ -178,7 +178,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; @@ -187,19 +187,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, @@ -246,19 +246,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. @@ -266,11 +266,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 d4762873d0cd..8318d28aea39 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 a639c2f75d35..d720b8b4759c 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 Fri Sep 25 23:11:03 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 F34534F6474; Mon, 7 Sep 2026 13:23: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=1788787443; cv=none; b=fSEwApR0O0Bs6DOZ93TjyOPoKx80djUgXCIsLOXH8PN/qLXa8YzcKuI4885T22mQHJy0Pxt6npon8s0ZBpNaM995w9cktkRYaWJuOXpbB/Mz+Sp4NrZJZcilfIm5NkN0B7dn2WcY8MRh/0L7XmVWizzPjQs6TJxgxownwusi2Pk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788787443; c=relaxed/simple; bh=PEV4VmqyUzWaIvBCsYaCgPOQyIwQAiWiqNJhv+fwV38=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fh+OOAC7NSUwuLexfOHXH+j4FshaNjghE5SQ+HpPVQkEJ+hRbyk6nux0KyV7jww3/oeoMFkjb3435G3OsS/f5GaMbFENPodxLIVVheqYh1Gz9WNUA5vyDUlLDJLbNpgXWJ6cEtJW0RvavWB/5fuaiZqkjWs9N0YAupYWehCPsPM= 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=hy6EaeDz; 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="hy6EaeDz" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id CE6331A1A3C; Mon, 7 Sep 2026 13:23:50 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 9CAA060383; Mon, 7 Sep 2026 13:23:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 3E3A811C7AF2D; Mon, 7 Sep 2026 15:23:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788787429; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=lXIi8l/32YatWuU9XivhB3JvROLOImwSss4KVwBRSPk=; b=hy6EaeDzE7zt9kKH0gZ0ai2K8IzPXVrf2jEddu4azA+MgFewVbwaWt5QAAhaR98vX3FVmg YIcI+1GsqrJCiJaGwJvkMSPc/s7iAc0x8MXucj8UlPxKs/AJSTKxofKBefQcsi7dc7y9Zh fchbzwSwkM42J2qNN9pBKwnkC+JH5mmnGvI1a4FvGj9ehMogaVC9iMaW+jpMKH59dQNLV0 ZwS2fl2lt6wA1SbTJ13xY4MdQcyRdC/gC7O6p27EbJc+sZOfATrrnX1laKT1/CCV1wIqYM nn0kEWIwZub2KUFJr2qAS1Pz4wljTjHrvhTzF8KNsNd5ZBsLmggI3IKUURHiJw== From: Paul Louvel Date: Mon, 07 Sep 2026 15:22:53 +0200 Subject: [PATCH v5 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: <20260907-7-1-rc1_talitos_cleanup-v5-19-860f43cd7317@bootlin.com> References: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@bootlin.com> In-Reply-To: <20260907-7-1-rc1_talitos_cleanup-v5-0-860f43cd7317@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=1788787387; l=3411; i=paul.louvel@bootlin.com; s=20260313; h=from:subject:message-id; bh=PEV4VmqyUzWaIvBCsYaCgPOQyIwQAiWiqNJhv+fwV38=; b=JGRnC2nykd/ogWIcIuWkIDE2UYNw2hPSPVmqD5puM3ZFSITejsiXHC4DPnERC8wKBOOL4EcVR v1QmZGpi9CmAGxXcQeozZU/BHmqDcitIMjiBIx4CWB0saQF2g+NJvrc 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 d720b8b4759c..a39d5ac74b66 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