arm: imx: hab: Optimise flow of authenticate_image on is_enabled fail

There is no need to call is_enabled() twice in authenticate_image - it does
nothing but add an additional layer of indentation.

We can check for is_enabled() at the start of the function and return the
result code directly.

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Peng Fan <peng.fan@nxp.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Sven Ebenfeld <sven.ebenfeld@gmail.com>
Cc: George McCollister <george.mccollister@gmail.com>
Cc: Breno Matheus Lima <brenomatheus@gmail.com>
Tested-by: Breno Lima <breno.lima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c
index 9fe6d43203757187ed3ca590c391ddeb174477df..6f86c02efb360f957f0d530757be6943aa7388d6 100644 (file)
--- a/arch/arm/mach-imx/hab.c
+++ b/arch/arm/mach-imx/hab.c
@@ -428,91 +428,91 @@ int authenticate_image(uint32_t ddr_start, uint32_t image_size)
        hab_rvt_entry = hab_rvt_entry_p;
        hab_rvt_exit = hab_rvt_exit_p;
 
-       if (is_hab_enabled()) {
-               printf("\nAuthenticate image from DDR location 0x%x...\n",
-                      ddr_start);
+       if (!is_hab_enabled()) {
+               puts("hab fuse not enabled\n");
+               return result;
+       }
 
-               hab_caam_clock_enable(1);
+       printf("\nAuthenticate image from DDR location 0x%x...\n",
+              ddr_start);
 
-               if (hab_rvt_entry() == HAB_SUCCESS) {
-                       /* If not already aligned, Align to ALIGN_SIZE */
-                       ivt_offset = (image_size + ALIGN_SIZE - 1) &
-                                       ~(ALIGN_SIZE - 1);
+       hab_caam_clock_enable(1);
 
-                       start = ddr_start;
-                       bytes = ivt_offset + IVT_SIZE + CSF_PAD_SIZE;
+       if (hab_rvt_entry() == HAB_SUCCESS) {
+               /* If not already aligned, Align to ALIGN_SIZE */
+               ivt_offset = (image_size + ALIGN_SIZE - 1) &
+                               ~(ALIGN_SIZE - 1);
+
+               start = ddr_start;
+               bytes = ivt_offset + IVT_SIZE + CSF_PAD_SIZE;
 #ifdef DEBUG
-                       printf("\nivt_offset = 0x%x, ivt addr = 0x%x\n",
-                              ivt_offset, ddr_start + ivt_offset);
-                       puts("Dumping IVT\n");
-                       print_buffer(ddr_start + ivt_offset,
-                                    (void *)(ddr_start + ivt_offset),
-                                    4, 0x8, 0);
-
-                       puts("Dumping CSF Header\n");
-                       print_buffer(ddr_start + ivt_offset+IVT_SIZE,
-                                    (void *)(ddr_start + ivt_offset+IVT_SIZE),
-                                    4, 0x10, 0);
+               printf("\nivt_offset = 0x%x, ivt addr = 0x%x\n",
+                      ivt_offset, ddr_start + ivt_offset);
+               puts("Dumping IVT\n");
+               print_buffer(ddr_start + ivt_offset,
+                            (void *)(ddr_start + ivt_offset),
+                            4, 0x8, 0);
+
+               puts("Dumping CSF Header\n");
+               print_buffer(ddr_start + ivt_offset + IVT_SIZE,
+                            (void *)(ddr_start + ivt_offset + IVT_SIZE),
+                            4, 0x10, 0);
 
 #if  !defined(CONFIG_SPL_BUILD)
-                       get_hab_status();
+               get_hab_status();
 #endif
 
-                       puts("\nCalling authenticate_image in ROM\n");
-                       printf("\tivt_offset = 0x%x\n", ivt_offset);
-                       printf("\tstart = 0x%08lx\n", start);
-                       printf("\tbytes = 0x%x\n", bytes);
+               puts("\nCalling authenticate_image in ROM\n");
+               printf("\tivt_offset = 0x%x\n", ivt_offset);
+               printf("\tstart = 0x%08lx\n", start);
+               printf("\tbytes = 0x%x\n", bytes);
 #endif
-                       /*
-                        * If the MMU is enabled, we have to notify the ROM
-                        * code, or it won't flush the caches when needed.
-                        * This is done, by setting the "pu_irom_mmu_enabled"
-                        * word to 1. You can find its address by looking in
-                        * the ROM map. This is critical for
-                        * authenticate_image(). If MMU is enabled, without
-                        * setting this bit, authentication will fail and may
-                        * crash.
-                        */
-                       /* Check MMU enabled */
-                       if (is_soc_type(MXC_SOC_MX6) && get_cr() & CR_M) {
-                               if (is_mx6dq()) {
-                                       /*
-                                        * This won't work on Rev 1.0.0 of
-                                        * i.MX6Q/D, since their ROM doesn't
-                                        * do cache flushes. don't think any
-                                        * exist, so we ignore them.
-                                        */
-                                       if (!is_mx6dqp())
-                                               writel(1, MX6DQ_PU_IROM_MMU_EN_VAR);
-                               } else if (is_mx6sdl()) {
-                                       writel(1, MX6DLS_PU_IROM_MMU_EN_VAR);
-                               } else if (is_mx6sl()) {
-                                       writel(1, MX6SL_PU_IROM_MMU_EN_VAR);
-                               }
+               /*
+                * If the MMU is enabled, we have to notify the ROM
+                * code, or it won't flush the caches when needed.
+                * This is done, by setting the "pu_irom_mmu_enabled"
+                * word to 1. You can find its address by looking in
+                * the ROM map. This is critical for
+                * authenticate_image(). If MMU is enabled, without
+                * setting this bit, authentication will fail and may
+                * crash.
+                */
+               /* Check MMU enabled */
+               if (is_soc_type(MXC_SOC_MX6) && get_cr() & CR_M) {
+                       if (is_mx6dq()) {
+                               /*
+                                * This won't work on Rev 1.0.0 of
+                                * i.MX6Q/D, since their ROM doesn't
+                                * do cache flushes. don't think any
+                                * exist, so we ignore them.
+                                */
+                               if (!is_mx6dqp())
+                                       writel(1, MX6DQ_PU_IROM_MMU_EN_VAR);
+                       } else if (is_mx6sdl()) {
+                               writel(1, MX6DLS_PU_IROM_MMU_EN_VAR);
+                       } else if (is_mx6sl()) {
+                               writel(1, MX6SL_PU_IROM_MMU_EN_VAR);
                        }
+               }
 
-                       load_addr = (uint32_t)hab_rvt_authenticate_image(
-                                       HAB_CID_UBOOT,
-                                       ivt_offset, (void **)&start,
-                                       (size_t *)&bytes, NULL);
-                       if (hab_rvt_exit() != HAB_SUCCESS) {
-                               puts("hab exit function fail\n");
-                               load_addr = 0;
-                       }
-               } else {
-                       puts("hab entry function fail\n");
+               load_addr = (uint32_t)hab_rvt_authenticate_image(
+                               HAB_CID_UBOOT,
+                               ivt_offset, (void **)&start,
+                               (size_t *)&bytes, NULL);
+               if (hab_rvt_exit() != HAB_SUCCESS) {
+                       puts("hab exit function fail\n");
+                       load_addr = 0;
                }
+       } else {
+               puts("hab entry function fail\n");
+       }
 
-               hab_caam_clock_enable(0);
+       hab_caam_clock_enable(0);
 
 #if !defined(CONFIG_SPL_BUILD)
-               get_hab_status();
+       get_hab_status();
 #endif
-       } else {
-               puts("hab fuse not enabled\n");
-       }
-
-       if ((!is_hab_enabled()) || (load_addr != 0))
+       if (load_addr != 0)
                result = 0;
 
        return result;