Merge tag 'rproc-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux-2.6-microblaze.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 52a9b7c..37da0c0 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -71,10 +71,26 @@ config ZCRYPT
        help
          Select this option if you want to enable support for
          s390 cryptographic adapters like:
-         + PCI-X Cryptographic Coprocessor (PCIXCC)
-         + Crypto Express 2,3,4 or 5 Coprocessor (CEXxC)
-         + Crypto Express 2,3,4 or 5 Accelerator (CEXxA)
-         + Crypto Express 4 or 5 EP11 Coprocessor (CEXxP)
+         + Crypto Express 2 up to 7 Coprocessor (CEXxC)
+         + Crypto Express 2 up to 7 Accelerator (CEXxA)
+         + Crypto Express 4 up to 7 EP11 Coprocessor (CEXxP)
+
+config ZCRYPT_DEBUG
+       bool "Enable debug features for s390 cryptographic adapters"
+       default n
+       depends on DEBUG_KERNEL
+       depends on ZCRYPT
+       help
+         Say 'Y' here to enable some additional debug features on the
+         s390 cryptographic adapters driver.
+
+         There will be some more sysfs attributes displayed for ap cards
+         and queues and some flags on crypto requests are interpreted as
+         debugging messages to force error injection.
+
+         Do not enable on production level kernel build.
+
+         If unsure, say N.
 
 config ZCRYPT_MULTIDEVNODES
        bool "Support for multiple zcrypt device nodes"
@@ -873,6 +889,7 @@ config CRYPTO_DEV_SA2UL
        select CRYPTO_AES
        select CRYPTO_AES_ARM64
        select CRYPTO_ALGAPI
+       select CRYPTO_AUTHENC
        select CRYPTO_SHA1
        select CRYPTO_SHA256
        select CRYPTO_SHA512