mirror of https://gitee.com/openkylin/linux.git
crypto: caam - move shared symbols in a common location
There are several issues with symbols shared b/w: -caam/jr and caam/qi drivers on one hand -caam/qi2 driver on the other hand Commit52813ab249
("crypto: caam/qi2 - avoid double export") fixed some of them, however compilation still fails for CRYPTO_DEV_FSL_CAAM=m and CRYPTO_DEV_FSL_DPAA2_CAAM=y. Another issue is related to dependency cycles reported by depmod when CRYPTO_DEV_FSL_CAAM=n and CRYPTO_DEV_FSL_DPAA2_CAAM=m, as mentioned in82c7b351be
("Revert "arm64: defconfig: Enable FSL_MC_BUS and FSL_MC_DPIO"") To fix all these, move the symbols shared by these drivers in a common location. The only existing possibility is error.c file (note that naming doesn't help and should probably change). Fixes:52813ab249
("crypto: caam/qi2 - avoid double export") Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
d45a90cb5d
commit
5b3b9871cc
|
@ -25,13 +25,6 @@
|
|||
#define CAAM_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + CTR_RFC3686_NONCE_SIZE + \
|
||||
SHA512_DIGEST_SIZE * 2)
|
||||
|
||||
#if !IS_ENABLED(CONFIG_CRYPTO_DEV_FSL_CAAM)
|
||||
bool caam_little_end;
|
||||
EXPORT_SYMBOL(caam_little_end);
|
||||
bool caam_imx;
|
||||
EXPORT_SYMBOL(caam_imx);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* This is a a cache of buffers, from which the users of CAAM QI driver
|
||||
* can allocate short buffers. It's speedier than doing kmalloc on the hotpath.
|
||||
|
|
|
@ -18,12 +18,8 @@
|
|||
#include "desc_constr.h"
|
||||
#include "ctrl.h"
|
||||
|
||||
bool caam_little_end;
|
||||
EXPORT_SYMBOL(caam_little_end);
|
||||
bool caam_dpaa2;
|
||||
EXPORT_SYMBOL(caam_dpaa2);
|
||||
bool caam_imx;
|
||||
EXPORT_SYMBOL(caam_imx);
|
||||
|
||||
#ifdef CONFIG_CAAM_QI
|
||||
#include "qi.h"
|
||||
|
|
|
@ -50,6 +50,12 @@ void caam_dump_sg(const char *level, const char *prefix_str, int prefix_type,
|
|||
#endif /* DEBUG */
|
||||
EXPORT_SYMBOL(caam_dump_sg);
|
||||
|
||||
bool caam_little_end;
|
||||
EXPORT_SYMBOL(caam_little_end);
|
||||
|
||||
bool caam_imx;
|
||||
EXPORT_SYMBOL(caam_imx);
|
||||
|
||||
static const struct {
|
||||
u8 value;
|
||||
const char *error_text;
|
||||
|
|
Loading…
Reference in New Issue