git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5530acc)
crypto: Kconfig - submenus for arm and arm64
authorRobert Elliott <elliott@hpe.com>
Sat, 20 Aug 2022 18:41:41 +0000 (13:41 -0500)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 26 Aug 2022 10:50:41 +0000 (18:50 +0800)
Move ARM- and ARM64-accelerated menus into a submenu under
the Crypto API menu (paralleling all the architectures).

Make each submenu always appear if the corresponding architecture
is supported. Get rid of the ARM_CRYPTO and ARM64_CRYPTO symbols.

The "ARM Accelerated" or "ARM64 Accelerated" entry disappears from:
    General setup  --->
    Platform selection  --->
    Kernel Features  --->
    Boot options  --->
    Power management options  --->
    CPU Power Management  --->
[*] ACPI (Advanced Configuration and Power Interface) Support  --->
[*] Virtualization  --->
[*] ARM Accelerated Cryptographic Algorithms  --->
     (or)
[*] ARM64 Accelerated Cryptographic Algorithms  --->
    ...
-*- Cryptographic API  --->
    Library routines  --->
    Kernel hacking  --->

and moves into the Cryptographic API menu, which now contains:
      ...
      Accelerated Cryptographic Algorithms for CPU (arm) --->
      (or)
      Accelerated Cryptographic Algorithms for CPU (arm64) --->
[*]   Hardware crypto devices  --->
      ...

Suggested-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Robert Elliott <elliott@hpe.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
13 files changed:
arch/arm/Kconfig patch | blob | history
arch/arm/configs/exynos_defconfig patch | blob | history
arch/arm/configs/milbeaut_m10v_defconfig patch | blob | history
arch/arm/configs/multi_v7_defconfig patch | blob | history
arch/arm/configs/omap2plus_defconfig patch | blob | history
arch/arm/configs/pxa_defconfig patch | blob | history
arch/arm/crypto/Kconfig patch | blob | history
arch/arm64/Kconfig patch | blob | history
arch/arm64/configs/defconfig patch | blob | history
arch/arm64/crypto/Kconfig patch | blob | history
crypto/Kconfig patch | blob | history
drivers/crypto/Kconfig patch | blob | history
drivers/net/Kconfig patch | blob | history

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 87badeae3181ea7ffd7aaca09fd12e8b3cf456b6..048a4354c2130db955a5bff960e459be8312ea90 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1921,8 +1921,4 @@ config ARCH_HIBERNATION_POSSIBLE
 
 endmenu
 
-if CRYPTO
-source "arch/arm/crypto/Kconfig"
-endif
-
 source "arch/arm/Kconfig.assembler"
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig
index 1ce74f46e114f1d55b15bd769f636bf87b27f197..9d7f87cfe33ae8eacf68547dacda213bb6c7ca17 100644 (file)
--- a/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@ -32,7 +32,6 @@ CONFIG_KERNEL_MODE_NEON=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_ENERGY_MODEL=y
-CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
 CONFIG_CRYPTO_SHA256_ARM=m
 CONFIG_CRYPTO_SHA512_ARM=m
diff --git a/arch/arm/configs/milbeaut_m10v_defconfig b/arch/arm/configs/milbeaut_m10v_defconfig
index 58810e98de3d4611f52d249d02211516b0038d22..10503747924ebba40cdc5dbb299bcbfec3084e72 100644 (file)
--- a/arch/arm/configs/milbeaut_m10v_defconfig
+++ b/arch/arm/configs/milbeaut_m10v_defconfig
@@ -44,7 +44,6 @@ CONFIG_ARM_CPUIDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_KERNEL_MODE_NEON=y
-CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
 CONFIG_CRYPTO_SHA1_ARM_CE=m
 CONFIG_CRYPTO_SHA2_ARM_CE=m
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 12b35008571f701b17de27047361499b35c0e956..0b67ad28aa7674365eaf53b7af8b6bea959dcd34 100644 (file)
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -132,7 +132,6 @@ CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARM_TEGRA_CPUIDLE=y
 CONFIG_ARM_QCOM_SPM_CPUIDLE=y
 CONFIG_KERNEL_MODE_NEON=y
-CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
 CONFIG_CRYPTO_SHA1_ARM_CE=m
 CONFIG_CRYPTO_SHA2_ARM_CE=m
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 99d015cf8919e158b78cea4c697db5cf4248e19f..e52e2dee44159122a780097362e540eca83989f8 100644 (file)
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -53,7 +53,6 @@ CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_PM_DEBUG=y
-CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM_NEON=m
 CONFIG_CRYPTO_SHA256_ARM=m
 CONFIG_CRYPTO_SHA512_ARM=m
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index 104a45722799933cf4726b8f1fc6c3b12bc33296..5a2c5358bbd9c93340a58c675189154f9f9c1e39 100644 (file)
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -34,7 +34,6 @@ CONFIG_CPUFREQ_DT=m
 CONFIG_ARM_PXA2xx_CPUFREQ=m
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
-CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_SHA256_ARM=m
 CONFIG_CRYPTO_SHA512_ARM=m
diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
index 149a5bd6b88c195b74c82f01d9044a9b618866b1..98b680da0495bed64c88dd2ea88ab0e795ba54d7 100644 (file)
--- a/arch/arm/crypto/Kconfig
+++ b/arch/arm/crypto/Kconfig
@@ -1,13 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
-menuconfig ARM_CRYPTO
-       bool "ARM Accelerated Cryptographic Algorithms"
-       depends on ARM
-       help
-         Say Y here to choose from a selection of cryptographic algorithms
-         implemented using ARM specific CPU features or instructions.
-
-if ARM_CRYPTO
+menu "Accelerated Cryptographic Algorithms for CPU (arm)"
 
 config CRYPTO_SHA1_ARM
        tristate "SHA1 digest algorithm (ARM-asm)"
@@ -170,4 +163,4 @@ config CRYPTO_CURVE25519_NEON
        select CRYPTO_LIB_CURVE25519_GENERIC
        select CRYPTO_ARCH_HAVE_LIB_CURVE25519
 
-endif
+endmenu
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 571cc234d0b3f320b81d63f38bc87725b6451211..91bf8e581dfe4c300387e09db4a2faf863647f01 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -2215,6 +2215,3 @@ source "drivers/acpi/Kconfig"
 
 source "arch/arm64/kvm/Kconfig"
 
-if CRYPTO
-source "arch/arm64/crypto/Kconfig"
-endif # CRYPTO
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index d5b2d2dd49043d26aaa71a7e996c083fc75963df..e7a87f63d9d55f9f0b3e1bab3ac98862acbdc07c 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -109,7 +109,6 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
 CONFIG_ACPI_APEI_EINJ=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
-CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM64_CE=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=m
diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 60db5bb2ddda5038bda4f60b12c42c4c58082058..536511a5db56ac1ee85215782a31f303076a9dfd 100644 (file)
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -1,13 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
-menuconfig ARM64_CRYPTO
-       bool "ARM64 Accelerated Cryptographic Algorithms"
-       depends on ARM64
-       help
-         Say Y here to choose from a selection of cryptographic algorithms
-         implemented using ARM64 specific CPU features or instructions.
-
-if ARM64_CRYPTO
+menu "Accelerated Cryptographic Algorithms for CPU (arm64)"
 
 config CRYPTO_SHA256_ARM64
        tristate "SHA-224/SHA-256 digest algorithm for arm64"
@@ -138,4 +131,4 @@ config CRYPTO_AES_ARM64_BS
        select CRYPTO_AES_ARM64_NEON_BLK
        select CRYPTO_LIB_AES
 
-endif
+endmenu
diff --git a/crypto/Kconfig b/crypto/Kconfig
index c249fdacba66d7b8d618a5be5d96db6b935bbef9..0349b27075aba6989404d8e489925caf7869db0e 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1292,6 +1292,12 @@ config CRYPTO_STATS
 config CRYPTO_HASH_INFO
        bool
 
+if ARM
+source "arch/arm/crypto/Kconfig"
+endif
+if ARM64
+source "arch/arm64/crypto/Kconfig"
+endif
 if MIPS
 source "arch/mips/crypto/Kconfig"
 endif
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 72c58b21ba62b830b222fc9b1d106d30e3571c9a..55e75fbb658ee1b5fd46a10fef0dde1e6dd3125d 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -802,7 +802,6 @@ source "drivers/crypto/amlogic/Kconfig"
 config CRYPTO_DEV_SA2UL
        tristate "Support for TI security accelerator"
        depends on ARCH_K3 || COMPILE_TEST
-       select ARM64_CRYPTO
        select CRYPTO_AES
        select CRYPTO_ALGAPI
        select CRYPTO_AUTHENC
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 94c889802566a1bb38c63f59666e210929e6bdd1..0e41d2295073ee9966f052052e34508dc10be9cc 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -85,8 +85,6 @@ config WIREGUARD
        select CRYPTO_POLY1305_X86_64 if X86 && 64BIT
        select CRYPTO_BLAKE2S_X86 if X86 && 64BIT
        select CRYPTO_CURVE25519_X86 if X86 && 64BIT
-       select ARM_CRYPTO if ARM
-       select ARM64_CRYPTO if ARM64
        select CRYPTO_CHACHA20_NEON if ARM || (ARM64 && KERNEL_MODE_NEON)
        select CRYPTO_POLY1305_NEON if ARM64 && KERNEL_MODE_NEON
        select CRYPTO_POLY1305_ARM if ARM
Unnamed repository; edit this file 'description' to name the repository.