From: Eric Biggers <ebigg...@google.com> Move the contents of arch/mips/lib/crypto/ into lib/crypto/mips/.
The new code organization makes a lot more sense for how this code actually works and is developed. In particular, it makes it possible to build each algorithm as a single module, with better inlining and dead code elimination. For a more detailed explanation, see the patchset which did this for the CRC library code: https://lore.kernel.org/r/20250607200454.73587-1-ebigg...@kernel.org/. Also see the patchset which did this for SHA-512: https://lore.kernel.org/linux-crypto/20250616014019.415791-1-ebigg...@kernel.org/ This is just a preparatory commit, which does the move to get the files into their new location but keeps them building the same way as before. Later commits will make the actual improvements to the way the arch-optimized code is integrated for each algorithm. arch/mips/lib/crypto/.gitignore is intentionally kept for now. See https://lore.kernel.org/r/CAHk-=whu2fb22rey6+okx1-+nchuwuczepvd0h2md38drjv...@mail.gmail.com/ I'll remove it later after some time has passed. Signed-off-by: Eric Biggers <ebigg...@google.com> --- arch/mips/lib/Makefile | 2 -- lib/crypto/Kconfig | 2 +- lib/crypto/Makefile | 1 + lib/crypto/mips/.gitignore | 2 ++ {arch/mips/lib/crypto => lib/crypto/mips}/Kconfig | 0 {arch/mips/lib/crypto => lib/crypto/mips}/Makefile | 0 {arch/mips/lib/crypto => lib/crypto/mips}/chacha-core.S | 0 {arch/mips/lib/crypto => lib/crypto/mips}/chacha-glue.c | 0 {arch/mips/lib/crypto => lib/crypto/mips}/poly1305-glue.c | 0 {arch/mips/lib/crypto => lib/crypto/mips}/poly1305-mips.pl | 0 10 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 lib/crypto/mips/.gitignore rename {arch/mips/lib/crypto => lib/crypto/mips}/Kconfig (100%) rename {arch/mips/lib/crypto => lib/crypto/mips}/Makefile (100%) rename {arch/mips/lib/crypto => lib/crypto/mips}/chacha-core.S (100%) rename {arch/mips/lib/crypto => lib/crypto/mips}/chacha-glue.c (100%) rename {arch/mips/lib/crypto => lib/crypto/mips}/poly1305-glue.c (100%) rename {arch/mips/lib/crypto => lib/crypto/mips}/poly1305-mips.pl (100%) diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 9d75845ef78e1..9c024e6d5e54c 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -1,12 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile for MIPS-specific library files.. # -obj-y += crypto/ - lib-y += bitops.o csum_partial.o delay.o memcpy.o memset.o \ mips-atomic.o strncpy_user.o \ strnlen_user.o uncached.o obj-y += iomap_copy.o diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index fdeb91bf00328..43c44316fbbdc 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -194,11 +194,11 @@ source "lib/crypto/arm/Kconfig" endif if ARM64 source "lib/crypto/arm64/Kconfig" endif if MIPS -source "arch/mips/lib/crypto/Kconfig" +source "lib/crypto/mips/Kconfig" endif if PPC source "arch/powerpc/lib/crypto/Kconfig" endif if RISCV diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 63ab907e8f53b..74331243b8c44 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -103,5 +103,6 @@ obj-$(CONFIG_CRYPTO_SELFTESTS) += simd.o obj-$(CONFIG_CRYPTO_LIB_SM3) += libsm3.o libsm3-y := sm3.o obj-$(CONFIG_ARM) += arm/ obj-$(CONFIG_ARM64) += arm64/ +obj-$(CONFIG_MIPS) += mips/ diff --git a/lib/crypto/mips/.gitignore b/lib/crypto/mips/.gitignore new file mode 100644 index 0000000000000..0d47d4f21c6de --- /dev/null +++ b/lib/crypto/mips/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +poly1305-core.S diff --git a/arch/mips/lib/crypto/Kconfig b/lib/crypto/mips/Kconfig similarity index 100% rename from arch/mips/lib/crypto/Kconfig rename to lib/crypto/mips/Kconfig diff --git a/arch/mips/lib/crypto/Makefile b/lib/crypto/mips/Makefile similarity index 100% rename from arch/mips/lib/crypto/Makefile rename to lib/crypto/mips/Makefile diff --git a/arch/mips/lib/crypto/chacha-core.S b/lib/crypto/mips/chacha-core.S similarity index 100% rename from arch/mips/lib/crypto/chacha-core.S rename to lib/crypto/mips/chacha-core.S diff --git a/arch/mips/lib/crypto/chacha-glue.c b/lib/crypto/mips/chacha-glue.c similarity index 100% rename from arch/mips/lib/crypto/chacha-glue.c rename to lib/crypto/mips/chacha-glue.c diff --git a/arch/mips/lib/crypto/poly1305-glue.c b/lib/crypto/mips/poly1305-glue.c similarity index 100% rename from arch/mips/lib/crypto/poly1305-glue.c rename to lib/crypto/mips/poly1305-glue.c diff --git a/arch/mips/lib/crypto/poly1305-mips.pl b/lib/crypto/mips/poly1305-mips.pl similarity index 100% rename from arch/mips/lib/crypto/poly1305-mips.pl rename to lib/crypto/mips/poly1305-mips.pl -- 2.49.0
