summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann2017-02-14 18:07:31 +0100
committerHerbert Xu2017-02-15 06:23:50 +0100
commiteafa26696a648f974942e12f42460abff80a646d (patch)
treee7c37790e42a82aac0007789ad3640a80c893a43
parentcrypto: cavium - cpt_bind_vq_to_grp could return an error code (diff)
downloadkernel-qcow2-linux-eafa26696a648f974942e12f42460abff80a646d.tar.gz
kernel-qcow2-linux-eafa26696a648f974942e12f42460abff80a646d.tar.xz
kernel-qcow2-linux-eafa26696a648f974942e12f42460abff80a646d.zip
crypto: cavium - fix Kconfig dependencies
The driver fails to build if MSI support is disabled: In file included from /git/arm-soc/drivers/crypto/cavium/cpt/cptpf_main.c:18:0: drivers/crypto/cavium/cpt/cptpf.h:57:20: error: array type has incomplete element type 'struct msix_entry' struct msix_entry msix_entries[CPT_PF_MSIX_VECTORS]; ^~~~~~~~~~~~ drivers/crypto/cavium/cpt/cptpf_main.c: In function 'cpt_enable_msix': drivers/crypto/cavium/cpt/cptpf_main.c:344:8: error: implicit declaration of function 'pci_enable_msix';did you mean 'cpt_enable_msix'? [-Werror=implicit-function-declaration] On the other hand, it doesn't seem to have any build dependency on ARCH_THUNDER, so let's allow compile-testing to catch this kind of problem more easily. The 64-bit dependency is needed for the use of readq/writeq. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: David Daney <david.daney@cavium.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/cavium/cpt/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/crypto/cavium/cpt/Kconfig b/drivers/crypto/cavium/cpt/Kconfig
index 247f1cbbefc1..cbd51b1aa046 100644
--- a/drivers/crypto/cavium/cpt/Kconfig
+++ b/drivers/crypto/cavium/cpt/Kconfig
@@ -7,7 +7,8 @@ config CRYPTO_DEV_CPT
config CAVIUM_CPT
tristate "Cavium Cryptographic Accelerator driver"
- depends on ARCH_THUNDER
+ depends on ARCH_THUNDER || COMPILE_TEST
+ depends on PCI_MSI && 64BIT
select CRYPTO_DEV_CPT
help
Support for Cavium CPT block found in octeon-tx series of