brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

crypto/fsl: make SEC%u status line consistent

Browse Source 
Align the status line with all the other output in U-Boot.

Before the change:
DDR    3.9 GiB (DDR3, 32-bit, CL=11, ECC on)
SEC0: RNG instantiated
WDT:   Started with servicing (60s timeout)

After the change:
DDR    3.9 GiB (DDR3, 32-bit, CL=11, ECC on)
SEC0:  RNG instantiated
WDT:   Started with servicing (60s timeout)

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Michael Walle 2020-06-27 22:58:48 +02:00 committed by Priyanka Jain
parent 317fff5909
commit 9b86bf2d14
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/crypto/fsl/jr.c
View File

@ -478,8 +478,8 @@ static int instantiate_rng(uint8_t sec_idx)
ret = run_descriptor_jr_idx(desc, sec_idx); ret = run_descriptor_jr_idx(desc, sec_idx);
if (ret) if (ret)
printf("RNG: Instantiation failed with error 0x%x\n", printf("SEC%u: RNG4 SH%d instantiation failed with error 0x%x\n",
ret); sec_idx, sh_idx, ret);
rdsta_val = sec_in32(&rng->rdsta) & RNG_STATE_HANDLE_MASK; rdsta_val = sec_in32(&rng->rdsta) & RNG_STATE_HANDLE_MASK;
if (!(rdsta_val & (1 << sh_idx))) { if (!(rdsta_val & (1 << sh_idx))) {
@ -569,7 +569,7 @@ static int rng_init(uint8_t sec_idx)
ret = instantiate_rng(sec_idx); ret = instantiate_rng(sec_idx);
} while ((ret == -1) && (ent_delay < RTSDCTL_ENT_DLY_MAX)); } while ((ret == -1) && (ent_delay < RTSDCTL_ENT_DLY_MAX));
if (ret) { if (ret) {
printf("RNG: Failed to instantiate RNG\n"); printf("SEC%u: Failed to instantiate RNG\n", sec_idx);
return ret; return ret;
} }
@ -592,7 +592,7 @@ int sec_init_idx(uint8_t sec_idx)
#endif #endif
if (!(sec_idx < CONFIG_SYS_FSL_MAX_NUM_OF_SEC)) { if (!(sec_idx < CONFIG_SYS_FSL_MAX_NUM_OF_SEC)) {
printf("SEC initialization failed\n"); printf("SEC%u: initialization failed\n", sec_idx);
return -1; return -1;
} }
@ -640,7 +640,7 @@ int sec_init_idx(uint8_t sec_idx)
ret = jr_init(sec_idx); ret = jr_init(sec_idx);
if (ret < 0) { if (ret < 0) {
printf("SEC initialization failed\n"); printf("SEC%u: initialization failed\n", sec_idx);
return -1; return -1;
} }
@ -654,10 +654,10 @@ int sec_init_idx(uint8_t sec_idx)
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
if (get_rng_vid(sec_idx) >= 4) { if (get_rng_vid(sec_idx) >= 4) {
if (rng_init(sec_idx) < 0) { if (rng_init(sec_idx) < 0) {
printf("SEC%u: RNG instantiation failed\n", sec_idx); printf("SEC%u: RNG instantiation failed\n", sec_idx);
return -1; return -1;
} }
printf("SEC%u: RNG instantiated\n", sec_idx); printf("SEC%u: RNG instantiated\n", sec_idx);
} }
#endif #endif
return ret; return ret;