tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
"Fix a number of autobuild failures due to missing Kconfig
dependencies"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: qat - add CRYPTO_AES to Kconfig dependencies
crypto: keembay - Add dependency on HAS_IOMEM
crypto: keembay - CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 should depend on ARCH_KEEMBAY

Linus Torvalds 33c148a4 cce622ab

+4 -2
+3 -2
drivers/crypto/keembay/Kconfig
··· 1 1 config CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 2 2 tristate "Support for Intel Keem Bay OCS AES/SM4 HW acceleration" 3 - depends on OF || COMPILE_TEST 3 + depends on HAS_IOMEM 4 + depends on ARCH_KEEMBAY || COMPILE_TEST 4 5 select CRYPTO_SKCIPHER 5 6 select CRYPTO_AEAD 6 7 select CRYPTO_ENGINE 7 8 help 8 9 Support for Intel Keem Bay Offload and Crypto Subsystem (OCS) AES and 9 - SM4 cihper hardware acceleration for use with Crypto API. 10 + SM4 cipher hardware acceleration for use with Crypto API. 10 11 11 12 Provides HW acceleration for the following transformations: 12 13 cbc(aes), ctr(aes), ccm(aes), gcm(aes), cbc(sm4), ctr(sm4), ccm(sm4)
+1
drivers/crypto/qat/Kconfig
··· 11 11 select CRYPTO_SHA1 12 12 select CRYPTO_SHA256 13 13 select CRYPTO_SHA512 14 + select CRYPTO_AES 14 15 select FW_LOADER 15 16 16 17 config CRYPTO_DEV_QAT_DH895xCC