diff options
author | Andrew F. Davis <afd@ti.com> | 2019-04-24 16:11:03 -0400 |
---|---|---|
committer | Andrew F. Davis <afd@ti.com> | 2019-04-25 09:26:17 -0400 |
commit | cd884aa6fb763a50671695071af7ce14c26d522d (patch) | |
tree | 3f4c7c6e38d0c1763b6379bb91205687b34e15d7 /lib/cpus | |
parent | c3e4e0888d92f5e82fdd626e2eb5fdee3892bb2a (diff) | |
download | trusted-firmware-a-cd884aa6fb763a50671695071af7ce14c26d522d.tar.gz |
Cortex-A53: Fix reporting of missing errata when not needed
Errata 819472, 824069, and 827319 are currently reported in a warning as
missing during boot for platforms that do not need them. Only warn when
the errata is needed for a given revision but not compiled in like other
errata workarounds.
Fixes: bd393704d2b1 ("Cortex-A53: Workarounds for 819472, 824069 and 827319")
Signed-off-by: Andrew F. Davis <afd@ti.com>
Change-Id: Ifd757b3d0e73a9bd465b98dc20648b6c13397d8d
Diffstat (limited to 'lib/cpus')
-rw-r--r-- | lib/cpus/aarch64/cortex_a53.S | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/lib/cpus/aarch64/cortex_a53.S b/lib/cpus/aarch64/cortex_a53.S index f20082d2d6..6fd3c53fdd 100644 --- a/lib/cpus/aarch64/cortex_a53.S +++ b/lib/cpus/aarch64/cortex_a53.S @@ -45,31 +45,35 @@ endfunc cortex_a53_disable_smp /* --------------------------------------------------- * Errata Workaround for Cortex A53 Errata #819472. * This applies only to revision <= r0p1 of Cortex A53. + * Due to the nature of the errata it is applied unconditionally + * when built in, report it as applicable in this case * --------------------------------------------------- */ func check_errata_819472 - /* - * Even though this is only needed for revision <= r0p1, it - * is always applied due to limitations of the current - * errata framework. - */ - mov x0, #ERRATA_APPLIES +#if ERRATA_A53_819472 + mov x0, #ERRATA_APPLIES ret +#else + mov x1, #0x01 + b cpu_rev_var_ls +#endif endfunc check_errata_819472 /* --------------------------------------------------- * Errata Workaround for Cortex A53 Errata #824069. * This applies only to revision <= r0p2 of Cortex A53. + * Due to the nature of the errata it is applied unconditionally + * when built in, report it as applicable in this case * --------------------------------------------------- */ func check_errata_824069 - /* - * Even though this is only needed for revision <= r0p2, it - * is always applied due to limitations of the current - * errata framework. - */ - mov x0, #ERRATA_APPLIES +#if ERRATA_A53_824069 + mov x0, #ERRATA_APPLIES ret +#else + mov x1, #0x02 + b cpu_rev_var_ls +#endif endfunc check_errata_824069 /* -------------------------------------------------- @@ -103,16 +107,18 @@ endfunc check_errata_826319 /* --------------------------------------------------- * Errata Workaround for Cortex A53 Errata #827319. * This applies only to revision <= r0p2 of Cortex A53. + * Due to the nature of the errata it is applied unconditionally + * when built in, report it as applicable in this case * --------------------------------------------------- */ func check_errata_827319 - /* - * Even though this is only needed for revision <= r0p2, it - * is always applied due to limitations of the current - * errata framework. - */ - mov x0, #ERRATA_APPLIES +#if ERRATA_A53_827319 + mov x0, #ERRATA_APPLIES ret +#else + mov x1, #0x02 + b cpu_rev_var_ls +#endif endfunc check_errata_827319 /* --------------------------------------------------------------------- |