Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 20:04:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto/fsl: allow accessing Job Ring from non-TrustZone

Browse source 
Add a new kconfig option to allow non-secure world access
to the CAAM Job Ring.
This is needed, for example, when running linux without
OP-TEE services, as it's done on Colibri iMX7.

Fixes: 51f1357f34 ("Revert "drivers/crypto/fsl: assign job-rings to non-TrustZone"")
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
This commit is contained in:
Emanuele Ghidoli 2024-03-28 11:30:12 +01:00 • committed by Fabio Estevam
parent 131d895f92
commit b9edc1ec86
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/crypto/fsl/Kconfig
View file

@ -62,6 +62,12 @@ config SYS_FSL_SEC_LE
if FSL_CAAM if FSL_CAAM
config FSL_CAAM_JR_NTZ_ACCESS
bool "Give CAAM Job Ring access to non-secure world"
help
It is needed when OP-TEE is not used and Freescale CAAM Job Ring linux
driver is used.
config FSL_CAAM_RNG config FSL_CAAM_RNG
bool "Enable Random Number Generator support" bool "Enable Random Number Generator support"
depends on DM_RNG depends on DM_RNG

19
drivers/crypto/fsl/jr.c
View file

@ -673,6 +673,21 @@ static int rng_init(uint8_t sec_idx, ccsr_sec_t *sec)
return ret; return ret;
} }
#if CONFIG_IS_ENABLED(FSL_CAAM_JR_NTZ_ACCESS)
static void jr_setown_non_trusted(ccsr_sec_t *sec)
{
u32 jrown_ns;
int i;
/* Set ownership of job rings to non-TrustZone mode */
for (i = 0; i < ARRAY_SIZE(sec->jrliodnr); i++) {
jrown_ns = sec_in32(&sec->jrliodnr[i].ms);
jrown_ns |= JROWN_NS | JRMID_NS;
sec_out32(&sec->jrliodnr[i].ms, jrown_ns);
}
}
#endif
int sec_init_idx(uint8_t sec_idx) int sec_init_idx(uint8_t sec_idx)
{ {
int ret = 0; int ret = 0;
@ -761,6 +776,10 @@ int sec_init_idx(uint8_t sec_idx)
#if CONFIG_IS_ENABLED(OF_CONTROL) #if CONFIG_IS_ENABLED(OF_CONTROL)
init: init:
#endif #endif
#if CONFIG_IS_ENABLED(FSL_CAAM_JR_NTZ_ACCESS)
jr_setown_non_trusted(sec);
#endif
ret = jr_init(sec_idx, caam); ret = jr_init(sec_idx, caam);
if (ret < 0) { if (ret < 0) {
printf("SEC%u: initialization failed\n", sec_idx); printf("SEC%u: initialization failed\n", sec_idx);

2
drivers/crypto/fsl/jr.h
View file

@ -37,6 +37,8 @@
#define JRNSLIODN_MASK 0x0fff0000 #define JRNSLIODN_MASK 0x0fff0000
#define JRSLIODN_SHIFT 0 #define JRSLIODN_SHIFT 0
#define JRSLIODN_MASK 0x00000fff #define JRSLIODN_MASK 0x00000fff
#define JROWN_NS 0x00000008
#define JRMID_NS 0x00000001
#define JRDID_MS_PRIM_DID BIT(0) #define JRDID_MS_PRIM_DID BIT(0)
#define JRDID_MS_PRIM_TZ BIT(4) #define JRDID_MS_PRIM_TZ BIT(4)