summaryrefslogtreecommitdiff
path: root/crypto/Kconfig
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-06-14 16:12:40 +0200
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2017-06-14 16:12:40 +0200
commitb1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4 (patch)
tree6b984a37fa4e4acdb9512719c7de1e84610a6242 /crypto/Kconfig
parent4c6427919ee920d5963cf826de76292286342aa0 (diff)
parent0930c08c6bc50a3a62ee3c90fad305840affbaf2 (diff)
downloadlinux-crypto-b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4.tar.gz
linux-crypto-b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4.zip
Merge tag 'v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.12-rc5
Diffstat (limited to 'crypto/Kconfig')
-rw-r--r--crypto/Kconfig18
1 files changed, 17 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index f37e9cca..aac4bc90 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -374,7 +374,6 @@ config CRYPTO_XTS
tristate "XTS support"
select CRYPTO_BLKCIPHER
select CRYPTO_MANAGER
- select CRYPTO_GF128MUL
select CRYPTO_ECB
help
XTS: IEEE1619/D16 narrow block cipher use with aes-xts-plain,
@@ -513,6 +512,23 @@ config CRYPTO_CRCT10DIF_PCLMUL
'crct10dif-plcmul' module, which is faster when computing the
crct10dif checksum as compared with the generic table implementation.
+config CRYPTO_CRCT10DIF_VPMSUM
+ tristate "CRC32T10DIF powerpc64 hardware acceleration"
+ depends on PPC64 && ALTIVEC && CRC_T10DIF
+ select CRYPTO_HASH
+ help
+ CRC10T10DIF algorithm implemented using vector polynomial
+ multiply-sum (vpmsum) instructions, introduced in POWER8. Enable on
+ POWER8 and newer processors for improved performance.
+
+config CRYPTO_VPMSUM_TESTER
+ tristate "Powerpc64 vpmsum hardware acceleration tester"
+ depends on CRYPTO_CRCT10DIF_VPMSUM && CRYPTO_CRC32C_VPMSUM
+ help
+ Stress test for CRC32c and CRC-T10DIF algorithms implemented with
+ POWER8 vpmsum instructions.
+ Unless you are testing these algorithms, you don't need this.
+
config CRYPTO_GHASH
tristate "GHASH digest algorithm"
select CRYPTO_GF128MUL