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 <breno.lima@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit b81379d3d2228760cc061a56c3c610b4e9fa9783)
(cherry picked from commit f2e2f48f64264f06ed0a20e23903852e0a0fd8f9)

diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index 61be97f..9f9ff45 100644 (file)
--- 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 2873b5f..de846ab 100644 (file)
--- 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) {