• R/O
  • HTTP
  • SSH
  • HTTPS

tomoyo-test1: Commit

This is a test repository.


Commit MetaInfo

Revision33c148a4ae7dc3cd440f6c0d746ac7f0ff320682 (tree)
Time2020-12-28 02:14:32
AuthorLinus Torvalds <torvalds@linu...>
CommiterLinus Torvalds

Log Message

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

Change Summary

Incremental Difference

--- a/drivers/crypto/keembay/Kconfig
+++ b/drivers/crypto/keembay/Kconfig
@@ -1,12 +1,13 @@
11 config CRYPTO_DEV_KEEMBAY_OCS_AES_SM4
22 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
45 select CRYPTO_SKCIPHER
56 select CRYPTO_AEAD
67 select CRYPTO_ENGINE
78 help
89 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.
1011
1112 Provides HW acceleration for the following transformations:
1213 cbc(aes), ctr(aes), ccm(aes), gcm(aes), cbc(sm4), ctr(sm4), ccm(sm4)
--- a/drivers/crypto/qat/Kconfig
+++ b/drivers/crypto/qat/Kconfig
@@ -11,6 +11,7 @@ config CRYPTO_DEV_QAT
1111 select CRYPTO_SHA1
1212 select CRYPTO_SHA256
1313 select CRYPTO_SHA512
14+ select CRYPTO_AES
1415 select FW_LOADER
1516
1617 config CRYPTO_DEV_QAT_DH895xCC
Show on old repository browser