From f9f86c03efebf81274b1ec66840410d58255fb84 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 22 Apr 2025 08:27:11 -0700 Subject: [PATCH] crypto: powerpc - move library functions to arch/powerpc/lib/crypto/ Continue disentangling the crypto library functions from the generic crypto infrastructure by moving the powerpc ChaCha and Poly1305 library functions into a new directory arch/powerpc/lib/crypto/ that does not depend on CRYPTO. This mirrors the distinction between crypto/ and lib/crypto/. Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu --- arch/powerpc/crypto/Kconfig | 14 -------------- arch/powerpc/crypto/Makefile | 4 ---- arch/powerpc/lib/Makefile | 2 ++ arch/powerpc/lib/crypto/Kconfig | 15 +++++++++++++++ arch/powerpc/lib/crypto/Makefile | 7 +++++++ arch/powerpc/{ => lib}/crypto/chacha-p10-glue.c | 0 arch/powerpc/{ => lib}/crypto/chacha-p10le-8x.S | 0 arch/powerpc/{ => lib}/crypto/poly1305-p10-glue.c | 0 arch/powerpc/{ => lib}/crypto/poly1305-p10le_64.S | 0 lib/crypto/Kconfig | 3 +++ 10 files changed, 27 insertions(+), 18 deletions(-) create mode 100644 arch/powerpc/lib/crypto/Kconfig create mode 100644 arch/powerpc/lib/crypto/Makefile rename arch/powerpc/{ => lib}/crypto/chacha-p10-glue.c (100%) rename arch/powerpc/{ => lib}/crypto/chacha-p10le-8x.S (100%) rename arch/powerpc/{ => lib}/crypto/poly1305-p10-glue.c (100%) rename arch/powerpc/{ => lib}/crypto/poly1305-p10le_64.S (100%) diff --git a/arch/powerpc/crypto/Kconfig b/arch/powerpc/crypto/Kconfig index 8bcc69013464..4bf7b01228e7 100644 --- a/arch/powerpc/crypto/Kconfig +++ b/arch/powerpc/crypto/Kconfig @@ -90,20 +90,6 @@ config CRYPTO_AES_GCM_P10 Support for cryptographic acceleration instructions on Power10 or later CPU. This module supports stitched acceleration for AES/GCM. -config CRYPTO_CHACHA20_P10 - tristate - depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - select CRYPTO_LIB_CHACHA_GENERIC - select CRYPTO_ARCH_HAVE_LIB_CHACHA - default CRYPTO_LIB_CHACHA_INTERNAL - -config CRYPTO_POLY1305_P10 - tristate - depends on PPC64 && CPU_LITTLE_ENDIAN && VSX - select CRYPTO_ARCH_HAVE_LIB_POLY1305 - select CRYPTO_LIB_POLY1305_GENERIC - default CRYPTO_LIB_POLY1305_INTERNAL - config CRYPTO_DEV_VMX bool "Support for VMX cryptographic acceleration instructions" depends on PPC64 && VSX diff --git a/arch/powerpc/crypto/Makefile b/arch/powerpc/crypto/Makefile index 2f00b22b0823..f13aec8a1833 100644 --- a/arch/powerpc/crypto/Makefile +++ b/arch/powerpc/crypto/Makefile @@ -11,8 +11,6 @@ obj-$(CONFIG_CRYPTO_SHA1_PPC) += sha1-powerpc.o obj-$(CONFIG_CRYPTO_SHA1_PPC_SPE) += sha1-ppc-spe.o obj-$(CONFIG_CRYPTO_SHA256_PPC_SPE) += sha256-ppc-spe.o obj-$(CONFIG_CRYPTO_AES_GCM_P10) += aes-gcm-p10-crypto.o -obj-$(CONFIG_CRYPTO_CHACHA20_P10) += chacha-p10-crypto.o -obj-$(CONFIG_CRYPTO_POLY1305_P10) += poly1305-p10-crypto.o obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) += vmx-crypto.o obj-$(CONFIG_CRYPTO_CURVE25519_PPC64) += curve25519-ppc64le.o @@ -22,8 +20,6 @@ sha1-powerpc-y := sha1-powerpc-asm.o sha1.o sha1-ppc-spe-y := sha1-spe-asm.o sha1-spe-glue.o sha256-ppc-spe-y := sha256-spe-asm.o sha256-spe-glue.o aes-gcm-p10-crypto-y := aes-gcm-p10-glue.o aes-gcm-p10.o ghashp10-ppc.o aesp10-ppc.o -chacha-p10-crypto-y := chacha-p10-glue.o chacha-p10le-8x.o -poly1305-p10-crypto-y := poly1305-p10-glue.o poly1305-p10le_64.o vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o aes_xts.o ghash.o curve25519-ppc64le-y := curve25519-ppc64le-core.o curve25519-ppc64le_asm.o diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index dd8a4b52a0cc..1cd74673cbf7 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -3,6 +3,8 @@ # Makefile for ppc-specific library files.. # +obj-y += crypto/ + CFLAGS_code-patching.o += -fno-stack-protector CFLAGS_feature-fixups.o += -fno-stack-protector diff --git a/arch/powerpc/lib/crypto/Kconfig b/arch/powerpc/lib/crypto/Kconfig new file mode 100644 index 000000000000..3f52610e45eb --- /dev/null +++ b/arch/powerpc/lib/crypto/Kconfig @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config CRYPTO_CHACHA20_P10 + tristate + depends on PPC64 && CPU_LITTLE_ENDIAN && VSX + default CRYPTO_LIB_CHACHA_INTERNAL + select CRYPTO_LIB_CHACHA_GENERIC + select CRYPTO_ARCH_HAVE_LIB_CHACHA + +config CRYPTO_POLY1305_P10 + tristate + depends on PPC64 && CPU_LITTLE_ENDIAN && VSX + default CRYPTO_LIB_POLY1305_INTERNAL + select CRYPTO_ARCH_HAVE_LIB_POLY1305 + select CRYPTO_LIB_POLY1305_GENERIC diff --git a/arch/powerpc/lib/crypto/Makefile b/arch/powerpc/lib/crypto/Makefile new file mode 100644 index 000000000000..5709ae14258a --- /dev/null +++ b/arch/powerpc/lib/crypto/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CRYPTO_CHACHA20_P10) += chacha-p10-crypto.o +chacha-p10-crypto-y := chacha-p10-glue.o chacha-p10le-8x.o + +obj-$(CONFIG_CRYPTO_POLY1305_P10) += poly1305-p10-crypto.o +poly1305-p10-crypto-y := poly1305-p10-glue.o poly1305-p10le_64.o diff --git a/arch/powerpc/crypto/chacha-p10-glue.c b/arch/powerpc/lib/crypto/chacha-p10-glue.c similarity index 100% rename from arch/powerpc/crypto/chacha-p10-glue.c rename to arch/powerpc/lib/crypto/chacha-p10-glue.c diff --git a/arch/powerpc/crypto/chacha-p10le-8x.S b/arch/powerpc/lib/crypto/chacha-p10le-8x.S similarity index 100% rename from arch/powerpc/crypto/chacha-p10le-8x.S rename to arch/powerpc/lib/crypto/chacha-p10le-8x.S diff --git a/arch/powerpc/crypto/poly1305-p10-glue.c b/arch/powerpc/lib/crypto/poly1305-p10-glue.c similarity index 100% rename from arch/powerpc/crypto/poly1305-p10-glue.c rename to arch/powerpc/lib/crypto/poly1305-p10-glue.c diff --git a/arch/powerpc/crypto/poly1305-p10le_64.S b/arch/powerpc/lib/crypto/poly1305-p10le_64.S similarity index 100% rename from arch/powerpc/crypto/poly1305-p10le_64.S rename to arch/powerpc/lib/crypto/poly1305-p10le_64.S diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index c5c01bc3569d..4b3e94ed84bb 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -165,6 +165,9 @@ endif if MIPS source "arch/mips/lib/crypto/Kconfig" endif +if PPC +source "arch/powerpc/lib/crypto/Kconfig" +endif endif endmenu -- 2.50.1