From patchwork Tue Jun 17 22:27:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 897663 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 EA689298261; Tue, 17 Jun 2025 22:29:59 +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=1750199400; cv=none; b=lKzjVg66o1vsYN6yiveyLx3GCau+VWuXuCh3iRV+occditjuYZAR1ytgPxV/RtFYaXVU2sCrGBNIyoQyYxmtldUI0OMbQ9NTom6eTFq+Vjy1GKXgTCtUEWUxv1Cq0jiUhRXgHFE1uKgUg6PcIFTjeoLI7zBJOFb+qFl+9P01c5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750199400; c=relaxed/simple; bh=Rnk2PwpW8Gu3iv/lRjgrxSUfjbCe7cqo5Kg5mCp+tec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U6t7U/pg1fUq4Oe9ZdqJQQeeizC7z/mqdNmcWin7KT04ZgbOV0wG10jgXu0GibXXgSaagj7iQsIjdiZADuV3LRBx0BIi65OYsD7SycaIPlxMH8mKu4XLFvUT5yZjQcrZhl0+0oiGcfCtnAJBTKLHR5TkU9Y/sCf/tBDfubm+NHs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n/EdaD8Z; 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="n/EdaD8Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 57EE0C4CEE3; Tue, 17 Jun 2025 22:29:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750199399; bh=Rnk2PwpW8Gu3iv/lRjgrxSUfjbCe7cqo5Kg5mCp+tec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/EdaD8Zyxy5dyg5bAmDEr6kkTLTwsspZ77aZlKeN6R2pbgomC606am8X+Ea7qgoq wfCxnVevVxbeN47HYmiSa7TebnsmsjlRcgR9BvQMMkeerD8+0V9escUwehU91SldVr Lca/VLgV4DTAmEx+PRc5EtEdTRpWy4Eeiiv38uYr9TPoNt9G9ZFPOR+FGRD7JPY8qO 0uFe+DtlIYq3vTf8pcTNyyZ+8KVGBRAYoIYRU6bV8HU2zFEp5bcrWVDSqknZfyjJGn pcYAGbC7srBvU4mNdXrndtYTL5zhosqb2AaphueSD989/jFzD6EUiYP82nhKMKudWC /FNOfCxOanE6w== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "Jason A . Donenfeld " , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org Subject: [PATCH 4/9] lib/crypto/powerpc: move arch/powerpc/lib/crypto/ to lib/crypto/powerpc/ Date: Tue, 17 Jun 2025 15:27:21 -0700 Message-ID: <20250617222726.365148-5-ebiggers@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617222726.365148-1-ebiggers@kernel.org> References: <20250617222726.365148-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Eric Biggers Move the contents of arch/powerpc/lib/crypto/ into lib/crypto/powerpc/. 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-ebiggers@kernel.org/. Also see the patchset which did this for SHA-512: https://lore.kernel.org/linux-crypto/20250616014019.415791-1-ebiggers@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. Signed-off-by: Eric Biggers --- arch/powerpc/lib/Makefile | 2 -- lib/crypto/Kconfig | 2 +- lib/crypto/Makefile | 1 + {arch/powerpc/lib/crypto => lib/crypto/powerpc}/Kconfig | 0 {arch/powerpc/lib/crypto => lib/crypto/powerpc}/Makefile | 0 .../powerpc/lib/crypto => lib/crypto/powerpc}/chacha-p10-glue.c | 0 .../powerpc/lib/crypto => lib/crypto/powerpc}/chacha-p10le-8x.S | 0 .../lib/crypto => lib/crypto/powerpc}/poly1305-p10-glue.c | 0 .../lib/crypto => lib/crypto/powerpc}/poly1305-p10le_64.S | 0 .../powerpc/lib/crypto => lib/crypto/powerpc}/sha256-spe-asm.S | 0 {arch/powerpc/lib/crypto => lib/crypto/powerpc}/sha256.c | 0 11 files changed, 2 insertions(+), 3 deletions(-) rename {arch/powerpc/lib/crypto => lib/crypto/powerpc}/Kconfig (100%) rename {arch/powerpc/lib/crypto => lib/crypto/powerpc}/Makefile (100%) rename {arch/powerpc/lib/crypto => lib/crypto/powerpc}/chacha-p10-glue.c (100%) rename {arch/powerpc/lib/crypto => lib/crypto/powerpc}/chacha-p10le-8x.S (100%) rename {arch/powerpc/lib/crypto => lib/crypto/powerpc}/poly1305-p10-glue.c (100%) rename {arch/powerpc/lib/crypto => lib/crypto/powerpc}/poly1305-p10le_64.S (100%) rename {arch/powerpc/lib/crypto => lib/crypto/powerpc}/sha256-spe-asm.S (100%) rename {arch/powerpc/lib/crypto => lib/crypto/powerpc}/sha256.c (100%) diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index 481f968e42c7b..27f8a01438603 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -1,12 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile for ppc-specific library files.. # -obj-y += crypto/ - CFLAGS_code-patching.o += -fno-stack-protector CFLAGS_feature-fixups.o += -fno-stack-protector CFLAGS_REMOVE_code-patching.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_feature-fixups.o = $(CC_FLAGS_FTRACE) diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index 43c44316fbbdc..f4f9a70dd0891 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -197,11 +197,11 @@ source "lib/crypto/arm64/Kconfig" endif if MIPS source "lib/crypto/mips/Kconfig" endif if PPC -source "arch/powerpc/lib/crypto/Kconfig" +source "lib/crypto/powerpc/Kconfig" endif if RISCV source "arch/riscv/lib/crypto/Kconfig" endif if S390 diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 74331243b8c44..47c889b881b2a 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -104,5 +104,6 @@ obj-$(CONFIG_CRYPTO_LIB_SM3) += libsm3.o libsm3-y := sm3.o obj-$(CONFIG_ARM) += arm/ obj-$(CONFIG_ARM64) += arm64/ obj-$(CONFIG_MIPS) += mips/ +obj-$(CONFIG_PPC) += powerpc/ diff --git a/arch/powerpc/lib/crypto/Kconfig b/lib/crypto/powerpc/Kconfig similarity index 100% rename from arch/powerpc/lib/crypto/Kconfig rename to lib/crypto/powerpc/Kconfig diff --git a/arch/powerpc/lib/crypto/Makefile b/lib/crypto/powerpc/Makefile similarity index 100% rename from arch/powerpc/lib/crypto/Makefile rename to lib/crypto/powerpc/Makefile diff --git a/arch/powerpc/lib/crypto/chacha-p10-glue.c b/lib/crypto/powerpc/chacha-p10-glue.c similarity index 100% rename from arch/powerpc/lib/crypto/chacha-p10-glue.c rename to lib/crypto/powerpc/chacha-p10-glue.c diff --git a/arch/powerpc/lib/crypto/chacha-p10le-8x.S b/lib/crypto/powerpc/chacha-p10le-8x.S similarity index 100% rename from arch/powerpc/lib/crypto/chacha-p10le-8x.S rename to lib/crypto/powerpc/chacha-p10le-8x.S diff --git a/arch/powerpc/lib/crypto/poly1305-p10-glue.c b/lib/crypto/powerpc/poly1305-p10-glue.c similarity index 100% rename from arch/powerpc/lib/crypto/poly1305-p10-glue.c rename to lib/crypto/powerpc/poly1305-p10-glue.c diff --git a/arch/powerpc/lib/crypto/poly1305-p10le_64.S b/lib/crypto/powerpc/poly1305-p10le_64.S similarity index 100% rename from arch/powerpc/lib/crypto/poly1305-p10le_64.S rename to lib/crypto/powerpc/poly1305-p10le_64.S diff --git a/arch/powerpc/lib/crypto/sha256-spe-asm.S b/lib/crypto/powerpc/sha256-spe-asm.S similarity index 100% rename from arch/powerpc/lib/crypto/sha256-spe-asm.S rename to lib/crypto/powerpc/sha256-spe-asm.S diff --git a/arch/powerpc/lib/crypto/sha256.c b/lib/crypto/powerpc/sha256.c similarity index 100% rename from arch/powerpc/lib/crypto/sha256.c rename to lib/crypto/powerpc/sha256.c