diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-04-26 12:47:08 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-04-26 12:47:08 +0000 |
| commit | f80a60ce2936064e4b1319326b68acaa92b9f802 (patch) | |
| tree | 6f373ae2b06afb089f94cd843b7078e084656377 | |
| parent | 8742f8574bcbb513480c53645dbc5b72ea5f451e (diff) | |
| parent | cd884aa6fb763a50671695071af7ce14c26d522d (diff) | |
Merge "Cortex-A53: Fix reporting of missing errata when not needed" into integration
| -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 f20082d2..6fd3c53f 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 /* --------------------------------------------------------------------- |