diff options
| author | Breno Lima <breno.lima@nxp.com> | 2021-03-25 17:30:21 +0800 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2021-04-08 09:18:29 +0200 |
| commit | 81d5605a8654ae735e751b59f3f2d7b09fe29471 (patch) | |
| tree | 06abbb1a1ccf46bdf7baea91215ff952afab24c2 | |
| parent | 4e682d555d80875ad062e3366b8970e199e04395 (diff) | |
| download | u-boot-81d5605a8654ae735e751b59f3f2d7b09fe29471.zip u-boot-81d5605a8654ae735e751b59f3f2d7b09fe29471.tar.gz u-boot-81d5605a8654ae735e751b59f3f2d7b09fe29471.tar.bz2 | |
cmd: blob: Instantiate RNG before running CMD_BLOB
U-Boot can instantiate CAAM RNG if needed by crypto operations.
Call sec_init() prior running a blob operation to ensure
RNG is correctly instantiated.
Make sure CAAM clock is enabled and check if a job ring is
available for that operation.
Signed-off-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | cmd/blob.c | 14 | ||||
| -rw-r--r-- | include/fsl_sec.h | 3 |
2 files changed, 17 insertions, 0 deletions
@@ -9,6 +9,10 @@ #include <malloc.h> #include <asm/byteorder.h> #include <linux/compiler.h> +#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) +#include <fsl_sec.h> +#include <asm/arch/clock.h> +#endif /** * blob_decap() - Decapsulate the data as a blob @@ -74,6 +78,16 @@ static int do_blob(struct cmd_tbl *cmdtp, int flag, int argc, src_ptr = (uint8_t *)(uintptr_t)src_addr; dst_ptr = (uint8_t *)(uintptr_t)dst_addr; +#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) + + hab_caam_clock_enable(1); + + u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR + + FSL_CAAM_ORSR_JRa_OFFSET); + if (out_jr_size != FSL_CAAM_MAX_JR_SIZE) + sec_init(); +#endif + if (enc) ret = blob_encap(km_ptr, src_ptr, dst_ptr, len); else diff --git a/include/fsl_sec.h b/include/fsl_sec.h index 40f1c5b..c661bd6 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -344,6 +344,9 @@ struct sg_entry { #define FSL_CAAM_MP_PRVK_BYTES 32 #define FSL_CAAM_MP_MES_DGST_BYTES 32 +#define FSL_CAAM_ORSR_JRa_OFFSET 0x102c +#define FSL_CAAM_MAX_JR_SIZE 4 + /* blob_dek: * Encapsulates the src in a secure blob and stores it dst * @src: reference to the plaintext |