From 6f1fa9dc3d8e815e60eb09f9aeb1fd0b442ff610 Mon Sep 17 00:00:00 2001 From: Breno Lima Date: Fri, 23 Mar 2018 17:25:15 -0300 Subject: [PATCH] MLK-17919: imx: Avoid hardcoded Job Ring Max size Prior instantiating RNG we have to ensure if the CAAM job rings are available. Avoid hardcoded job ring max size and use the definition at fsl_sec.h Signed-off-by: Breno Lima Reviewed-by: Ye Li (cherry picked from commit b81379d3d2228760cc061a56c3c610b4e9fa9783) (cherry picked from commit f2e2f48f64264f06ed0a20e23903852e0a0fd8f9) --- arch/arm/mach-imx/cmd_dek.c | 3 +-- arch/arm/mach-imx/cmd_mfgprot.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index 61be97f80c..9f9ff453a9 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -26,13 +26,12 @@ static int blob_encap_dek(const u8 *src, u8 *dst, u32 len) { int ret = 0; - u32 jr_size = 4; 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 != jr_size) + if (out_jr_size != FSL_CAAM_MAX_JR_SIZE) sec_init(); if (!((len == 128) | (len == 192) | (len == 256))) { diff --git a/arch/arm/mach-imx/cmd_mfgprot.c b/arch/arm/mach-imx/cmd_mfgprot.c index 2873b5f0b7..de846aba67 100644 --- a/arch/arm/mach-imx/cmd_mfgprot.c +++ b/arch/arm/mach-imx/cmd_mfgprot.c @@ -42,14 +42,12 @@ static int do_mfgprot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) sel = argv[1]; /* Enable HAB clock */ - u32 jr_size = 4; - 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 != jr_size) + if (out_jr_size != FSL_CAAM_MAX_JR_SIZE) sec_init(); if (strcmp(sel, pubk) == 0) { -- 2.17.1