diff options
| author | Lauren Wehrmeister <lauren.wehrmeister@arm.com> | 2023-01-11 20:57:27 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-01-11 20:57:27 +0100 |
| commit | fb797974736a3f69ef38127fe68b0290169269ca (patch) | |
| tree | 92dda1cba48323aae4a8f1e2128fb3bfd607592d /lib | |
| parent | 601e2d4325a7def628990f4a25889f374c81ca06 (diff) | |
| parent | 89d85ad0aad4fef7f56a9e18968b49e2b843ca9d (diff) | |
| download | arm-trusted-firmware-fb797974736a3f69ef38127fe68b0290169269ca.tar.gz | |
Merge "fix(cpus): workaround for Cortex-A710 erratum 2282622" into integration
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpus/aarch64/cortex_a710.S | 12 | ||||
| -rw-r--r-- | lib/cpus/cpu-ops.mk | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/cpus/aarch64/cortex_a710.S b/lib/cpus/aarch64/cortex_a710.S index 3ea55df2c..cebd6f011 100644 --- a/lib/cpus/aarch64/cortex_a710.S +++ b/lib/cpus/aarch64/cortex_a710.S @@ -355,22 +355,22 @@ endfunc check_errata_2216384 /* --------------------------------------------------------------- * Errata Workaround for Cortex-A710 Erratum 2282622. - * This applies to revision r0p0, r1p0 and r2p0. - * It is fixed in r2p1. + * This applies to revision r0p0, r1p0, r2p0 and r2p1. + * It is still open. * Inputs: * x0: variant[4:7] and revision[0:3] of current cpu. * Shall clobber: x0, x1, x17 * --------------------------------------------------------------- */ func errata_a710_2282622_wa - /* Compare x0 against revision r2p0 */ + /* Compare x0 against revision r2p1 */ mov x17, x30 bl check_errata_2282622 cbz x0, 1f /* Apply the workaround */ mrs x1, CORTEX_A710_CPUACTLR2_EL1 - orr x1, x1, BIT(0) + orr x1, x1, #BIT(0) msr CORTEX_A710_CPUACTLR2_EL1, x1 1: @@ -378,8 +378,8 @@ func errata_a710_2282622_wa endfunc errata_a710_2282622_wa func check_errata_2282622 - /* Applies to r0p0, r1p0 and r2p0 */ - mov x1, #0x20 + /* Applies to r0p0, r1p0, r2p0 and r2p1 */ + mov x1, #0x21 b cpu_rev_var_ls endfunc check_errata_2282622 diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index b1f7d27e1..44ffef188 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -563,7 +563,8 @@ ERRATA_A710_2147715 ?=0 ERRATA_A710_2216384 ?=0 # 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 # Flag to apply erratum 2291219 workaround during reset. This erratum applies |