Message ID | 1519089566-17147-1-git-send-email-brenomatheus@gmail.com |
---|---|
State | Accepted |
Commit | 669f2d189e4c3a738ad2863a5f8f66a85d468bd9 |
Delegated to: | Stefano Babic |
Headers | show |
Series | [U-Boot,1/5] imx: hab: Keep CAAM clock enabled after authenticating additional images | expand |
On Mon, Feb 19, 2018 at 10:19 PM, Breno Lima <brenomatheus@gmail.com> wrote: > From: Breno Lima <breno.lima@nxp.com> > > Currently it is not possible to run CMD_DEK on i.MX SPL targets: > > => dek_blob 0x12000000 0x12001000 128 > > The system hangs after running dek_blob because the CAAM clock is being > disabled by the HAB code. There is no need to disable CAAM clock after > authenticating additional boot images, thus keep CAAM clock enabled to > address this issue. > > Signed-off-by: Breno Lima <breno.lima@nxp.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
On 20/02/2018 11:44, Fabio Estevam wrote: > On Mon, Feb 19, 2018 at 10:19 PM, Breno Lima <brenomatheus@gmail.com> wrote: >> From: Breno Lima <breno.lima@nxp.com> >> >> Currently it is not possible to run CMD_DEK on i.MX SPL targets: >> >> => dek_blob 0x12000000 0x12001000 128 >> >> The system hangs after running dek_blob because the CAAM clock is being >> disabled by the HAB code. There is no need to disable CAAM clock after >> authenticating additional boot images, thus keep CAAM clock enabled to >> address this issue. >> >> Signed-off-by: Breno Lima <breno.lima@nxp.com> > > Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com> > Series contains fixes, I pick it up for the release. Best regards, Stefano Babic
diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 5f19777..1e6b31d 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -507,13 +507,13 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size, /* Verify IVT header bugging out on error */ if (verify_ivt_header(ivt_hdr)) - goto hab_caam_clock_disable; + goto hab_authentication_exit; /* Verify IVT body */ if (ivt->self != ivt_addr) { printf("ivt->self 0x%08x pointer is 0x%08x\n", ivt->self, ivt_addr); - goto hab_caam_clock_disable; + goto hab_authentication_exit; } start = ddr_start; @@ -591,8 +591,7 @@ hab_exit_failure_print_status: get_hab_status(); #endif -hab_caam_clock_disable: - hab_caam_clock_enable(0); +hab_authentication_exit: if (load_addr != 0) result = 0;