diff options
| author | Yatharth Kochar <yatharth.kochar@arm.com> | 2014-11-20 18:09:41 +0000 |
|---|---|---|
| committer | Achin Gupta <achin.gupta@arm.com> | 2015-01-26 19:04:15 +0000 |
| commit | 79a97b2ef723365663b403223002d29aeb675c85 (patch) | |
| tree | 7845353dd58e3d75b4b66abd414b6f19ca78b41a /bl31 | |
| parent | 9d212557979e3c99b48ca18d9bd5583926368391 (diff) | |
Call reset handlers upon BL3-1 entry.
This patch adds support to call the reset_handler() function in BL3-1 in the
cold and warm boot paths when another Boot ROM reset_handler() has already run.
This means the BL1 and BL3-1 versions of the CPU and platform specific reset
handlers may execute different code to each other. This enables a developer to
perform additional actions or undo actions already performed during the first
call of the reset handlers e.g. apply additional errata workarounds.
Typically, the reset handler will be first called from the BL1 Boot ROM. Any
additional functionality can be added to the reset handler when it is called
from BL3-1 resident in RW memory. The constant FIRST_RESET_HANDLER_CALL is used
to identify whether this is the first version of the reset handler code to be
executed or an overridden version of the code.
The Cortex-A57 errata workarounds are applied only if they have not already been
applied.
Fixes ARM-software/tf-issue#275
Change-Id: Id295f106e4fda23d6736debdade2ac7f2a9a9053
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index b786b29d..01d7a7f5 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -61,15 +61,21 @@ func bl31_entrypoint bic x0, x0, #SCTLR_EE_BIT msr sctlr_el3, x0 isb +#endif - /* ----------------------------------------------------- - * Perform any processor specific actions upon reset - * e.g. cache, tlb invalidations etc. Override the - * Boot ROM(BL0) programming sequence - * ----------------------------------------------------- + /* --------------------------------------------- + * When RESET_TO_BL31 is true, perform any + * processor specific actions upon reset e.g. + * cache, tlb invalidations, errata workarounds + * etc. + * When RESET_TO_BL31 is false, perform any + * processor specific actions which undo or are + * in addition to the actions performed by the + * reset handler in the Boot ROM (BL1). + * --------------------------------------------- */ bl reset_handler -#endif + /* --------------------------------------------- * Enable the instruction cache, stack pointer * and data access alignment checks |