These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / crypto / nx / Kconfig

diff --git a/kernel/drivers/crypto/nx/Kconfig b/kernel/drivers/crypto/nx/Kconfig
index f826166..ad7552a 100644 (file)
--- a/kernel/drivers/crypto/nx/Kconfig
+++ b/kernel/drivers/crypto/nx/Kconfig
@@ -1,26 +1,48 @@
+
 config CRYPTO_DEV_NX_ENCRYPT
-       tristate "Encryption acceleration support"
-       depends on PPC64 && IBMVIO
+       tristate "Encryption acceleration support on pSeries platform"
+       depends on PPC_PSERIES && IBMVIO && !CPU_LITTLE_ENDIAN
        default y
        select CRYPTO_AES
-       select CRYPTO_CBC
-       select CRYPTO_ECB
        select CRYPTO_CCM
-       select CRYPTO_GCM
-       select CRYPTO_AUTHENC
-       select CRYPTO_XCBC
-       select CRYPTO_SHA256
-       select CRYPTO_SHA512
        help
-         Support for Power7+ in-Nest encryption acceleration. This
-         module supports acceleration for AES and SHA2 algorithms. If you
-         choose 'M' here, this module will be called nx_crypto.
+         Support for PowerPC Nest (NX) encryption acceleration. This
+         module supports acceleration for AES and SHA2 algorithms on
+         the pSeries platform.  If you choose 'M' here, this module
+         will be called nx_crypto.
 
 config CRYPTO_DEV_NX_COMPRESS
        tristate "Compression acceleration support"
-       depends on PPC64 && IBMVIO
+       default y
+       select CRYPTO_ALGAPI
+       select 842_DECOMPRESS
+       help
+         Support for PowerPC Nest (NX) compression acceleration. This
+         module supports acceleration for compressing memory with the 842
+         algorithm using the cryptographic API.  One of the platform
+         drivers must be selected also.  If you choose 'M' here, this
+         module will be called nx_compress.
+
+if CRYPTO_DEV_NX_COMPRESS
+
+config CRYPTO_DEV_NX_COMPRESS_PSERIES
+       tristate "Compression acceleration support on pSeries platform"
+       depends on PPC_PSERIES && IBMVIO
        default y
        help
-         Support for Power7+ in-Nest compression acceleration. This
-         module supports acceleration for AES and SHA2 algorithms. If you
-         choose 'M' here, this module will be called nx_compress.
+         Support for PowerPC Nest (NX) compression acceleration. This
+         module supports acceleration for compressing memory with the 842
+         algorithm.  This supports NX hardware on the pSeries platform.
+         If you choose 'M' here, this module will be called nx_compress_pseries.
+
+config CRYPTO_DEV_NX_COMPRESS_POWERNV
+       tristate "Compression acceleration support on PowerNV platform"
+       depends on PPC_POWERNV
+       default y
+       help
+         Support for PowerPC Nest (NX) compression acceleration. This
+         module supports acceleration for compressing memory with the 842
+         algorithm.  This supports NX hardware on the PowerNV platform.
+         If you choose 'M' here, this module will be called nx_compress_powernv.
+
+endif