diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 16:02:00 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-12-01 08:06:40 -0500 |
commit | 37d8468108efb19b80aa8484534f8850ed60dbfb (patch) | |
tree | 0e747e893592986684d999d6310fe53e66821a66 | |
parent | 9c0bc511e93cc7693f0147274edfb719f221b8c1 (diff) |
crypto: caam - make aamalg_desc a proper module
The drivers/crypto/caam/ directory is entered during build only
for building modules when CONFIG_CRYPTO_DEV_FSL_CAAM=m, but
CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC is defined as a
'bool' symbol, meaning that caamalg_desc.c is always compiled
into built-in code, or not at all, leading to a link failure:
ERROR: "cnstr_shdsc_xts_ablkcipher_decap" [drivers/crypto/caam/caamalg.ko] undefined!
ERROR: "cnstr_shdsc_xts_ablkcipher_encap" [drivers/crypto/caam/caamalg.ko] undefined!
ERROR: "cnstr_shdsc_aead_givencap" [drivers/crypto/caam/caamalg.ko] undefined!
ERROR: "cnstr_shdsc_aead_decap" [drivers/crypto/caam/caamalg.ko] undefined!
ERROR: "cnstr_shdsc_aead_encap" [drivers/crypto/caam/caamalg.ko] undefined!
ERROR: "cnstr_shdsc_aead_null_decap" [drivers/crypto/caam/caamalg.ko] undefined!
ERROR: "cnstr_shdsc_aead_null_encap" [drivers/crypto/caam/caamalg.ko] undefined!
ERROR: "cnstr_shdsc_rfc4106_decap" [drivers/crypto/caam/caamalg.ko] undefined!
ERROR: "cnstr_shdsc_rfc4106_encap" [drivers/crypto/caam/caamalg.ko] undefined!
...
Making caamalg_desc itself a loadable module fixes this configuration
by ensuring the driver gets built. Aside from making the symbol
'tristate', I'm adding appropriate module metadata here.
Fixes: 8cea7b66b821 ("crypto: caam - refactor encryption descriptors generation")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | drivers/crypto/caam/Kconfig | 2 | ||||
-rw-r--r-- | drivers/crypto/caam/caamalg_desc.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/crypto/caam/Kconfig b/drivers/crypto/caam/Kconfig index da24c5752c06..bc0d3569f8d9 100644 --- a/drivers/crypto/caam/Kconfig +++ b/drivers/crypto/caam/Kconfig | |||
@@ -136,4 +136,4 @@ config CRYPTO_DEV_FSL_CAAM_DEBUG | |||
136 | information in the CAAM driver. | 136 | information in the CAAM driver. |
137 | 137 | ||
138 | config CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC | 138 | config CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC |
139 | def_bool CRYPTO_DEV_FSL_CAAM_CRYPTO_API | 139 | def_tristate CRYPTO_DEV_FSL_CAAM_CRYPTO_API |
diff --git a/drivers/crypto/caam/caamalg_desc.c b/drivers/crypto/caam/caamalg_desc.c index 7dee952ef432..f3f48c10b9d6 100644 --- a/drivers/crypto/caam/caamalg_desc.c +++ b/drivers/crypto/caam/caamalg_desc.c | |||
@@ -1300,3 +1300,7 @@ void cnstr_shdsc_xts_ablkcipher_decap(u32 * const desc, struct alginfo *cdata) | |||
1300 | #endif | 1300 | #endif |
1301 | } | 1301 | } |
1302 | EXPORT_SYMBOL(cnstr_shdsc_xts_ablkcipher_decap); | 1302 | EXPORT_SYMBOL(cnstr_shdsc_xts_ablkcipher_decap); |
1303 | |||
1304 | MODULE_LICENSE("GPL"); | ||
1305 | MODULE_DESCRIPTION("FSL CAAM descriptor support"); | ||
1306 | MODULE_AUTHOR("Freescale Semiconductor - NMG/STC"); | ||