summaryrefslogtreecommitdiff
path: root/drivers/crypto/fsl/jr.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-02-04 08:30:13 -0500
committerTom Rini <trini@konsulko.com>2018-02-04 08:30:13 -0500
commitab1af91093e3a5e3e86b77ebaf568facd386a1df (patch)
treeaa005b3bd0fd5716d8dd3b69c1c55f14a34f5f9e /drivers/crypto/fsl/jr.c
parentb2153075f42c2d46d310778e226bcb11f0af47f5 (diff)
parentd1ceb0c4881332cb0586920f0a40f8e4a48d99a9 (diff)
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'drivers/crypto/fsl/jr.c')
-rw-r--r--drivers/crypto/fsl/jr.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c
index 986eabfb088..a05779826fe 100644
--- a/drivers/crypto/fsl/jr.c
+++ b/drivers/crypto/fsl/jr.c
@@ -566,6 +566,8 @@ int sec_init_idx(uint8_t sec_idx)
{
ccsr_sec_t *sec = (void *)SEC_ADDR(sec_idx);
uint32_t mcr = sec_in32(&sec->mcfgr);
+ uint32_t jrown_ns;
+ int i;
int ret = 0;
#ifdef CONFIG_FSL_CORENET
@@ -621,6 +623,13 @@ int sec_init_idx(uint8_t sec_idx)
#endif
#endif
+ /* Set ownership of job rings to non-TrustZone mode by default */
+ 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);
+ }
+
ret = jr_init(sec_idx);
if (ret < 0) {
printf("SEC initialization failed\n");