| Message ID | 1490602527-1654-1-git-send-email-lukma@denx.de |
|---|---|
| State | Accepted |
| Commit | b8c908762c7828b99af99dd688f775ae53506b1d |
| Delegated to: | Tom Rini |
| Headers | show |
On Mon, Mar 27, 2017 at 10:15:27AM +0200, Lukasz Majewski wrote: > Up till this commit passing NULL as input parameter was allowed, but not > handled properly. > > When one passed NULL to one of this function parameters, the code was > executed causing data abort. > > However, what is more interesting, the abort was not caught because of code > execution in HYP mode with masked CPSR A bit ("Imprecise Data Abort mask bit). > The TI's AM57xx SoC switch to HYP mode with A bit masked in lowlevel_init.S > due to SMC call. Such operation (by default) is performed in SoC ROM code. > > The problem would pop up when one: > - Switch back to SVC mode after disabling LPAE support > - Somebody enables A bit (by executing cpsie a asm instruction) > > and then the previously described exception would be caught. > > Signed-off-by: Lukasz Majewski <lukma@denx.de> Reviewed-by: Tom Rini <trini@konsulko.com>
On Mon, Mar 27, 2017 at 10:15:27AM +0200, Lukasz Majewski wrote: > Up till this commit passing NULL as input parameter was allowed, but not > handled properly. > > When one passed NULL to one of this function parameters, the code was > executed causing data abort. > > However, what is more interesting, the abort was not caught because of code > execution in HYP mode with masked CPSR A bit ("Imprecise Data Abort mask bit). > The TI's AM57xx SoC switch to HYP mode with A bit masked in lowlevel_init.S > due to SMC call. Such operation (by default) is performed in SoC ROM code. > > The problem would pop up when one: > - Switch back to SVC mode after disabling LPAE support > - Somebody enables A bit (by executing cpsie a asm instruction) > > and then the previously described exception would be caught. > > Signed-off-by: Lukasz Majewski <lukma@denx.de> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c index 84f93e7..93c4c6f 100644 --- a/arch/arm/mach-omap2/clocks-common.c +++ b/arch/arm/mach-omap2/clocks-common.c @@ -828,27 +828,29 @@ void do_enable_clocks(u32 const *clk_domains, u32 i, max = 100; /* Put the clock domains in SW_WKUP mode */ - for (i = 0; (i < max) && clk_domains[i]; i++) { + for (i = 0; (i < max) && clk_domains && clk_domains[i]; i++) { enable_clock_domain(clk_domains[i], CD_CLKCTRL_CLKTRCTRL_SW_WKUP); } /* Clock modules that need to be put in HW_AUTO */ - for (i = 0; (i < max) && clk_modules_hw_auto[i]; i++) { + for (i = 0; (i < max) && clk_modules_hw_auto && + clk_modules_hw_auto[i]; i++) { enable_clock_module(clk_modules_hw_auto[i], MODULE_CLKCTRL_MODULEMODE_HW_AUTO, wait_for_enable); }; /* Clock modules that need to be put in SW_EXPLICIT_EN mode */ - for (i = 0; (i < max) && clk_modules_explicit_en[i]; i++) { + for (i = 0; (i < max) && clk_modules_explicit_en && + clk_modules_explicit_en[i]; i++) { enable_clock_module(clk_modules_explicit_en[i], MODULE_CLKCTRL_MODULEMODE_SW_EXPLICIT_EN, wait_for_enable); }; /* Put the clock domains in HW_AUTO mode now */ - for (i = 0; (i < max) && clk_domains[i]; i++) { + for (i = 0; (i < max) && clk_domains && clk_domains[i]; i++) { enable_clock_domain(clk_domains[i], CD_CLKCTRL_CLKTRCTRL_HW_AUTO); }
Up till this commit passing NULL as input parameter was allowed, but not handled properly. When one passed NULL to one of this function parameters, the code was executed causing data abort. However, what is more interesting, the abort was not caught because of code execution in HYP mode with masked CPSR A bit ("Imprecise Data Abort mask bit). The TI's AM57xx SoC switch to HYP mode with A bit masked in lowlevel_init.S due to SMC call. Such operation (by default) is performed in SoC ROM code. The problem would pop up when one: - Switch back to SVC mode after disabling LPAE support - Somebody enables A bit (by executing cpsie a asm instruction) and then the previously described exception would be caught. Signed-off-by: Lukasz Majewski <lukma@denx.de> --- Changes for v2: - Rebase to the newest "master" branch --- arch/arm/mach-omap2/clocks-common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)