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 /include | |
| 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 'include')
| -rw-r--r-- | include/common/bl_common.h | 12 | ||||
| -rw-r--r-- | include/lib/cpus/aarch64/cpu_macros.S | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h index 9945e3a3..0959c893 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -90,6 +90,18 @@ (_p)->h.attr = (uint32_t)(_attr) ; \ } while (0) +/******************************************************************************* + * Constant that indicates if this is the first version of the reset handler + * contained in an image. This will be the case when the image is BL1 or when + * its BL3-1 and RESET_TO_BL31 is true. This constant enables a subsequent + * version of the reset handler to perform actions that override the ones + * performed in the first version of the code. This will be required when the + * first version exists in an un-modifiable image e.g. a BootROM image. + ******************************************************************************/ +#if IMAGE_BL1 || (IMAGE_BL31 && RESET_TO_BL31) +#define FIRST_RESET_HANDLER_CALL +#endif + #ifndef __ASSEMBLY__ #include <cdefs.h> /* For __dead2 */ #include <cassert.h> diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S index 65fb82d6..089f09c4 100644 --- a/include/lib/cpus/aarch64/cpu_macros.S +++ b/include/lib/cpus/aarch64/cpu_macros.S @@ -40,7 +40,7 @@ CPU_MIDR: /* cpu_ops midr */ .space 8 /* Reset fn is needed in BL at reset vector */ -#if IMAGE_BL1 || (IMAGE_BL31 && RESET_TO_BL31) +#if IMAGE_BL1 || IMAGE_BL31 CPU_RESET_FUNC: /* cpu_ops reset_func */ .space 8 #endif @@ -65,7 +65,7 @@ CPU_OPS_SIZE = . .section cpu_ops, "a"; .align 3 .type cpu_ops_\_name, %object .quad \_midr -#if IMAGE_BL1 || (IMAGE_BL31 && RESET_TO_BL31) +#if IMAGE_BL1 || IMAGE_BL31 .if \_noresetfunc .quad 0 .else |