From nobody Sat Feb 7 21:08:15 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A6B18191F9C; Mon, 20 Oct 2025 00:53:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760921612; cv=none; b=URITJsuWDWVxsAMrNWcPIyKk8dPyuWbt5xeleJsCxxsA/8fB35GU558uXPeT5n3xJCsLBMKGeTHsr3ACWw0rSI2g8qijMG08Yl/EvtFy5P/vo+8Xl5OuQUCFVs+nb8NWEbzVD9LsiwhML2W22+Xe1Li9IyarALKylrYpPScHIRM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760921612; c=relaxed/simple; bh=Y9Gh5NX+Xkq+eNV4N4mdP/PaI0Z1KJcE1oP/YqXj9K4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pkYS2+DWF8m4bsvIGz44JXDs0H2j4A9J0UgpKpkCtTfx5bUa9+F38yUD39n1y59C/fFEN28dooYV3xoJ/EqkIq9Wy0/wvcjl008j7Cfa1Wfo14iM97b36P5X1wgTdepCgZ7xE7mgrFIDFwstfGKMD7Pr/3gS65fgxpzrV9SHTT8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NBOZRs3E; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NBOZRs3E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3551C4AF09; Mon, 20 Oct 2025 00:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760921612; bh=Y9Gh5NX+Xkq+eNV4N4mdP/PaI0Z1KJcE1oP/YqXj9K4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NBOZRs3E1gzSfg8V/39IG+n9ZwkE5r4um/mONt1VG59Z72gZiYvq58iD3U056ONN/ LwL4JQiL/xjwShE9dXDUeVVnBtzcldXunITVcYU7JHlEnq3e5gfhkCTcW0XRCDqeU9 3KWzvkRHwhRJgNEdHkIuAUIlw2vDAJx/LEOH6ll6Yt5vihODVzZ10/EQoHCUbLfhrT 2a6yW9jP9qh7CdRObBczszygoV2l8BLngr9suXD7wCO2Etb5xjftdzzgWa0trwrZ1Q BS710aDApMwShoFhhbz5sCc1JglsWK+VXhd4oftKW/pvzVNFMv1qdC35132kgxboJ6 u9DBQ7edEzpmg== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: David Howells , Ard Biesheuvel , "Jason A . Donenfeld" , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, Harald Freudenberger , Eric Biggers , Holger Dengler , Herbert Xu , Stephan Mueller Subject: [PATCH 01/17] s390/sha3: Rename conflicting functions Date: Sun, 19 Oct 2025 17:50:22 -0700 Message-ID: <20251020005038.661542-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.51.1.dirty In-Reply-To: <20251020005038.661542-1-ebiggers@kernel.org> References: <20251020005038.661542-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: David Howells Rename the s390 sha3_* functions to have an "s390_" prefix to avoid conflict with generic code. Signed-off-by: David Howells Acked-By: Harald Freudenberger cc: Eric Biggers cc: "Jason A. Donenfeld" cc: Ard Biesheuvel cc: Holger Dengler cc: Herbert Xu cc: Stephan Mueller cc: linux-crypto@vger.kernel.org cc: linux-s390@vger.kernel.org Link: https://lore.kernel.org/r/20251017144311.817771-2-dhowells@redhat.com Signed-off-by: Eric Biggers --- arch/s390/crypto/sha3_256_s390.c | 26 +++++++++++++------------- arch/s390/crypto/sha3_512_s390.c | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/s390/crypto/sha3_256_s390.c b/arch/s390/crypto/sha3_256_s= 390.c index 03bb4f4bab701..fd5ecae60a572 100644 --- a/arch/s390/crypto/sha3_256_s390.c +++ b/arch/s390/crypto/sha3_256_s390.c @@ -17,11 +17,11 @@ #include #include =20 #include "sha.h" =20 -static int sha3_256_init(struct shash_desc *desc) +static int s390_sha3_256_init(struct shash_desc *desc) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); =20 sctx->first_message_part =3D test_facility(86); if (!sctx->first_message_part) @@ -30,11 +30,11 @@ static int sha3_256_init(struct shash_desc *desc) sctx->func =3D CPACF_KIMD_SHA3_256; =20 return 0; } =20 -static int sha3_256_export(struct shash_desc *desc, void *out) +static int s390_sha3_256_export(struct shash_desc *desc, void *out) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); union { u8 *u8; u64 *u64; @@ -48,11 +48,11 @@ static int sha3_256_export(struct shash_desc *desc, voi= d *out) for (i =3D 0; i < SHA3_STATE_SIZE / 8; i++) put_unaligned(le64_to_cpu(sctx->sha3.state[i]), p.u64++); return 0; } =20 -static int sha3_256_import(struct shash_desc *desc, const void *in) +static int s390_sha3_256_import(struct shash_desc *desc, const void *in) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); union { const u8 *u8; const u64 *u64; @@ -66,26 +66,26 @@ static int sha3_256_import(struct shash_desc *desc, con= st void *in) sctx->func =3D CPACF_KIMD_SHA3_256; =20 return 0; } =20 -static int sha3_224_import(struct shash_desc *desc, const void *in) +static int s390_sha3_224_import(struct shash_desc *desc, const void *in) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); =20 - sha3_256_import(desc, in); + s390_sha3_256_import(desc, in); sctx->func =3D CPACF_KIMD_SHA3_224; return 0; } =20 static struct shash_alg sha3_256_alg =3D { .digestsize =3D SHA3_256_DIGEST_SIZE, /* =3D 32 */ - .init =3D sha3_256_init, + .init =3D s390_sha3_256_init, .update =3D s390_sha_update_blocks, .finup =3D s390_sha_finup, - .export =3D sha3_256_export, - .import =3D sha3_256_import, + .export =3D s390_sha3_256_export, + .import =3D s390_sha3_256_import, .descsize =3D S390_SHA_CTX_SIZE, .statesize =3D SHA3_STATE_SIZE, .base =3D { .cra_name =3D "sha3-256", .cra_driver_name =3D "sha3-256-s390", @@ -94,26 +94,26 @@ static struct shash_alg sha3_256_alg =3D { .cra_blocksize =3D SHA3_256_BLOCK_SIZE, .cra_module =3D THIS_MODULE, } }; =20 -static int sha3_224_init(struct shash_desc *desc) +static int s390_sha3_224_init(struct shash_desc *desc) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); =20 - sha3_256_init(desc); + s390_sha3_256_init(desc); sctx->func =3D CPACF_KIMD_SHA3_224; return 0; } =20 static struct shash_alg sha3_224_alg =3D { .digestsize =3D SHA3_224_DIGEST_SIZE, - .init =3D sha3_224_init, + .init =3D s390_sha3_224_init, .update =3D s390_sha_update_blocks, .finup =3D s390_sha_finup, - .export =3D sha3_256_export, /* same as for 256 */ - .import =3D sha3_224_import, /* function code different! */ + .export =3D s390_sha3_256_export, /* same as for 256 */ + .import =3D s390_sha3_224_import, /* function code different! */ .descsize =3D S390_SHA_CTX_SIZE, .statesize =3D SHA3_STATE_SIZE, .base =3D { .cra_name =3D "sha3-224", .cra_driver_name =3D "sha3-224-s390", diff --git a/arch/s390/crypto/sha3_512_s390.c b/arch/s390/crypto/sha3_512_s= 390.c index a5c9690eecb19..f4b52a3a04339 100644 --- a/arch/s390/crypto/sha3_512_s390.c +++ b/arch/s390/crypto/sha3_512_s390.c @@ -16,11 +16,11 @@ #include #include =20 #include "sha.h" =20 -static int sha3_512_init(struct shash_desc *desc) +static int s390_sha3_512_init(struct shash_desc *desc) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); =20 sctx->first_message_part =3D test_facility(86); if (!sctx->first_message_part) @@ -29,11 +29,11 @@ static int sha3_512_init(struct shash_desc *desc) sctx->func =3D CPACF_KIMD_SHA3_512; =20 return 0; } =20 -static int sha3_512_export(struct shash_desc *desc, void *out) +static int s390_sha3_512_export(struct shash_desc *desc, void *out) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); union { u8 *u8; u64 *u64; @@ -47,11 +47,11 @@ static int sha3_512_export(struct shash_desc *desc, voi= d *out) for (i =3D 0; i < SHA3_STATE_SIZE / 8; i++) put_unaligned(le64_to_cpu(sctx->sha3.state[i]), p.u64++); return 0; } =20 -static int sha3_512_import(struct shash_desc *desc, const void *in) +static int s390_sha3_512_import(struct shash_desc *desc, const void *in) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); union { const u8 *u8; const u64 *u64; @@ -65,26 +65,26 @@ static int sha3_512_import(struct shash_desc *desc, con= st void *in) sctx->func =3D CPACF_KIMD_SHA3_512; =20 return 0; } =20 -static int sha3_384_import(struct shash_desc *desc, const void *in) +static int s390_sha3_384_import(struct shash_desc *desc, const void *in) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); =20 - sha3_512_import(desc, in); + s390_sha3_512_import(desc, in); sctx->func =3D CPACF_KIMD_SHA3_384; return 0; } =20 static struct shash_alg sha3_512_alg =3D { .digestsize =3D SHA3_512_DIGEST_SIZE, - .init =3D sha3_512_init, + .init =3D s390_sha3_512_init, .update =3D s390_sha_update_blocks, .finup =3D s390_sha_finup, - .export =3D sha3_512_export, - .import =3D sha3_512_import, + .export =3D s390_sha3_512_export, + .import =3D s390_sha3_512_import, .descsize =3D S390_SHA_CTX_SIZE, .statesize =3D SHA3_STATE_SIZE, .base =3D { .cra_name =3D "sha3-512", .cra_driver_name =3D "sha3-512-s390", @@ -95,26 +95,26 @@ static struct shash_alg sha3_512_alg =3D { } }; =20 MODULE_ALIAS_CRYPTO("sha3-512"); =20 -static int sha3_384_init(struct shash_desc *desc) +static int s390_sha3_384_init(struct shash_desc *desc) { struct s390_sha_ctx *sctx =3D shash_desc_ctx(desc); =20 - sha3_512_init(desc); + s390_sha3_512_init(desc); sctx->func =3D CPACF_KIMD_SHA3_384; return 0; } =20 static struct shash_alg sha3_384_alg =3D { .digestsize =3D SHA3_384_DIGEST_SIZE, - .init =3D sha3_384_init, + .init =3D s390_sha3_384_init, .update =3D s390_sha_update_blocks, .finup =3D s390_sha_finup, - .export =3D sha3_512_export, /* same as for 512 */ - .import =3D sha3_384_import, /* function code different! */ + .export =3D s390_sha3_512_export, /* same as for 512 */ + .import =3D s390_sha3_384_import, /* function code different! */ .descsize =3D S390_SHA_CTX_SIZE, .statesize =3D SHA3_STATE_SIZE, .base =3D { .cra_name =3D "sha3-384", .cra_driver_name =3D "sha3-384-s390", --=20 2.51.1.dirty