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

Merge "fix(errata): workaround for Neoverse-V1 erratum 2372203" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2022-06-16 23:30:22 +02:00 • committed by TrustedFirmware Code Review
commit ffa3f9423b
4 changed files with 46 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -419,6 +419,9 @@ For Neoverse V1, the following errata build flags are defined :
- ``ERRATA_V1_2294912``: This applies errata 2294912 workaround to Neoverse-V1
CPU. This needs to be enabled for revisions r0p0, r1p0, and r1p1 of the CPU.
- ``ERRATA_V1_2372203``: This applies errata 2372203 workaround to Neoverse-V1
CPU. This needs to be enabled for revisions r0p0, r1p0 and r1p1 of the CPU.
It is still open.
For Cortex-A710, the following errata build flags are defined :

1
include/lib/cpus/aarch64/neoverse_v1.h
View file

@ -35,5 +35,6 @@
#define NEOVERSE_V1_ACTLR2_EL1_BIT_0 ULL(1)
#define NEOVERSE_V1_ACTLR2_EL1_BIT_2 (ULL(1) << 2)
#define NEOVERSE_V1_ACTLR2_EL1_BIT_28 (ULL(1) << 28)
#define NEOVERSE_V1_ACTLR2_EL1_BIT_40 (ULL(1) << 40)
#endif /* NEOVERSE_V1_H */

34
lib/cpus/aarch64/neoverse_v1.S
View file

@ -358,6 +358,34 @@ func check_errata_2294912
b cpu_rev_var_ls
endfunc check_errata_2294912
/* ---------------------------------------------------
* Errata Workaround for Neoverse V1 Errata #2372203.
* This applies to revisions <= r1p1 and is still open.
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x17
* ----------------------------------------------------
*/
func errata_neoverse_v1_2372203_wa
/* Check workaround compatibility. */
mov x17, x30
bl check_errata_2372203
cbz x0, 1f
/* Set bit 40 in ACTLR2_EL1 */
mrs x1, NEOVERSE_V1_ACTLR2_EL1
orr x1, x1, #NEOVERSE_V1_ACTLR2_EL1_BIT_40
msr NEOVERSE_V1_ACTLR2_EL1, x1
isb
1:
ret x17
endfunc errata_neoverse_v1_2372203_wa
func check_errata_2372203
/* Applies to <= r1p1. */
mov x1, #0x11
b cpu_rev_var_ls
endfunc check_errata_2372203
func check_errata_cve_2022_23960
#if WORKAROUND_CVE_2022_23960
mov x0, #ERRATA_APPLIES
@ -407,6 +435,7 @@ func neoverse_v1_errata_report
report_errata ERRATA_V1_2108267, neoverse_v1, 2108267
report_errata ERRATA_V1_2216392, neoverse_v1, 2216392
report_errata ERRATA_V1_2294912, neoverse_v1, 2294912
report_errata ERRATA_V1_2372203, neoverse_v1, 2372203
report_errata WORKAROUND_CVE_2022_23960, neoverse_v1, cve_2022_23960
ldp x8, x30, [sp], #16
@ -471,6 +500,11 @@ func neoverse_v1_reset_func
bl errata_neoverse_v1_2294912_wa
#endif
#if ERRATA_V1_2372203
mov x0, x18
bl errata_neoverse_v1_2372203_wa
#endif
#if IMAGE_BL31 && WORKAROUND_CVE_2022_23960
/*
* The Neoverse-V1 generic vectors are overridden to apply errata

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

@ -476,6 +476,10 @@ ERRATA_V1_2216392 ?=0
# to revisions r0p0, r1p0, and r1p1 of the Neoverse V1 cpu and is still open.
ERRATA_V1_2294912 ?=0
# Flag to apply erratum 2372203 workaround during reset. This erratum applies
# to revisions r0p0, r1p0 and r1p1 of the Neoverse V1 cpu and is still open.
ERRATA_V1_2372203 ?=0
# Flag to apply erratum 1987031 workaround during reset. This erratum applies
# to revisions r0p0, r1p0 and r2p0 of the Cortex-A710 cpu and is still open.
ERRATA_A710_1987031 ?=0
@ -1019,6 +1023,10 @@ $(eval $(call add_define,ERRATA_V1_2216392))
$(eval $(call assert_boolean,ERRATA_V1_2294912))
$(eval $(call add_define,ERRATA_V1_2294912))
# Process ERRATA_V1_2372203 flag
$(eval $(call assert_boolean,ERRATA_V1_2372203))
$(eval $(call add_define,ERRATA_V1_2372203))
# Process ERRATA_A710_1987031 flag
$(eval $(call assert_boolean,ERRATA_A710_1987031))
$(eval $(call add_define,ERRATA_A710_1987031))