Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-25 06:19:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(cpus): workaround for Cortex-A710 erratum 2282622

Browse source 
Cortex-A710 erratum 2282622 is a Cat B erratum that applies to
all revisions <=r2p1 and is still open. The workaround was earlier
applied to all revisions <= r2p0, this patch extends it to r2p1.
This was thought to have been fixed in r2p1 which is not the case.

SDEN documentation:
https://developer.arm.com/documentation/SDEN1775101/latest

Signed-off-by: Bipin Ravi <bipin.ravi@arm.com>
Change-Id: Iad38a7fe57bec3f2d8977995acd601dcd9ae69c0
This commit is contained in:
Bipin Ravi 2022-12-22 13:31:46 -06:00
parent f4d8ed50d2
commit 89d85ad0aa
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/design/cpu-specific-build-macros.rst
View file

@ -503,8 +503,8 @@ For Cortex-A710, the following errata build flags are defined :
of the CPU and is fixed in r2p1. of the CPU and is fixed in r2p1.
- ``ERRATA_A710_2282622``: This applies errata 2282622 workaround to - ``ERRATA_A710_2282622``: This applies errata 2282622 workaround to
Cortex-A710 CPU. This needs to be enabled for revisions r0p0, r1p0 and r2p0 Cortex-A710 CPU. This needs to be enabled for revisions r0p0, r1p0, r2p0 and
of the CPU and is fixed in r2p1. r2p1 of the CPU and is still open.
- ``ERRATA_A710_2291219``: This applies errata 2291219 workaround to - ``ERRATA_A710_2291219``: This applies errata 2291219 workaround to
Cortex-A710 CPU. This needs to be enabled for revisions r0p0, r1p0 and r2p0 Cortex-A710 CPU. This needs to be enabled for revisions r0p0, r1p0 and r2p0

12
lib/cpus/aarch64/cortex_a710.S
View file

@ -355,22 +355,22 @@ endfunc check_errata_2216384
/* --------------------------------------------------------------- /* ---------------------------------------------------------------
* Errata Workaround for Cortex-A710 Erratum 2282622. * Errata Workaround for Cortex-A710 Erratum 2282622.
* This applies to revision r0p0, r1p0 and r2p0. * This applies to revision r0p0, r1p0, r2p0 and r2p1.
* It is fixed in r2p1. * It is still open.
* Inputs: * Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu. * x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0, x1, x17 * Shall clobber: x0, x1, x17
* --------------------------------------------------------------- * ---------------------------------------------------------------
*/ */
func errata_a710_2282622_wa func errata_a710_2282622_wa
/* Compare x0 against revision r2p0 */ /* Compare x0 against revision r2p1 */
mov x17, x30 mov x17, x30
bl check_errata_2282622 bl check_errata_2282622
cbz x0, 1f cbz x0, 1f
/* Apply the workaround */ /* Apply the workaround */
mrs x1, CORTEX_A710_CPUACTLR2_EL1 mrs x1, CORTEX_A710_CPUACTLR2_EL1
orr x1, x1, BIT(0) orr x1, x1, #BIT(0)
msr CORTEX_A710_CPUACTLR2_EL1, x1 msr CORTEX_A710_CPUACTLR2_EL1, x1
1: 1:
@ -378,8 +378,8 @@ func errata_a710_2282622_wa
endfunc errata_a710_2282622_wa endfunc errata_a710_2282622_wa
func check_errata_2282622 func check_errata_2282622
/* Applies to r0p0, r1p0 and r2p0 */ /* Applies to r0p0, r1p0, r2p0 and r2p1 */
mov x1, #0x20 mov x1, #0x21
b cpu_rev_var_ls b cpu_rev_var_ls
endfunc check_errata_2282622 endfunc check_errata_2282622

3
lib/cpus/cpu-ops.mk
View file

@ -557,7 +557,8 @@ ERRATA_A710_2147715 ?=0
ERRATA_A710_2216384 ?=0 ERRATA_A710_2216384 ?=0
# Flag to apply erratum 2282622 workaround during reset. This erratum applies # Flag to apply erratum 2282622 workaround during reset. This erratum applies
# to revision r0p0, r1p0 and r2p0 of the Cortex-A710 cpu and is fixed in r2p1. # to revision r0p0, r1p0, r2p0 and r2p1 of the Cortex-A710 cpu and is still
# open.
ERRATA_A710_2282622 ?=0 ERRATA_A710_2282622 ?=0
# Flag to apply erratum 2291219 workaround during reset. This erratum applies # Flag to apply erratum 2291219 workaround during reset. This erratum applies