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>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c
index 9a96557..bd38042 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 dd506a1..1430f61 100644 (file)
--- a/arch/arm/mach-imx/cmd_mfgprot.c
+++ b/arch/arm/mach-imx/cmd_mfgprot.c
@@ -41,14 +41,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) {