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

Merge changes from topic "ar/errata_refactor" into integration

Browse source 
* changes:
  fix(cpus): workaround for Neoverse N2 erratum 2779511
  fix(errata-abi): added Neoverse N2 to Errata ABI list
  fix(cpus): workaround for Neoverse N2 erratum 2743014
  fix(docs): updated certain Neoverse N2 erratum status in docs
  refactor(cpus): convert Neoverse N2 to use CPU helpers
  refactor(cpus): convert Neoverse N2 to framework
  refactor(cpus): reorder Neoverse N2 errata by ascending order
This commit is contained in:
Bipin Ravi 2023-08-04 18:01:07 +02:00 • committed by TrustedFirmware Code Review
commit db8621a2fe
7 changed files with 158 additions and 528 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -601,47 +601,50 @@ For Cortex-A710, the following errata build flags are defined :
For Neoverse N2, the following errata build flags are defined : For Neoverse N2, the following errata build flags are defined :
- ``ERRATA_N2_2002655``: This applies errata 2002655 workaround to Neoverse-N2 - ``ERRATA_N2_2002655``: This applies errata 2002655 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU, it is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2067956``: This applies errata 2067956 workaround to Neoverse-N2 - ``ERRATA_N2_2067956``: This applies errata 2067956 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2025414``: This applies errata 2025414 workaround to Neoverse-N2 - ``ERRATA_N2_2025414``: This applies errata 2025414 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2189731``: This applies errata 2189731 workaround to Neoverse-N2 - ``ERRATA_N2_2189731``: This applies errata 2189731 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2138956``: This applies errata 2138956 workaround to Neoverse-N2 - ``ERRATA_N2_2138956``: This applies errata 2138956 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2138953``: This applies errata 2138953 workaround to Neoverse-N2 - ``ERRATA_N2_2138953``: This applies errata 2138953 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revisions r0p0, r0p1, r0p2, r0p3 and is still open.
- ``ERRATA_N2_2242415``: This applies errata 2242415 workaround to Neoverse-N2 - ``ERRATA_N2_2242415``: This applies errata 2242415 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2138958``: This applies errata 2138958 workaround to Neoverse-N2 - ``ERRATA_N2_2138958``: This applies errata 2138958 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2242400``: This applies errata 2242400 workaround to Neoverse-N2 - ``ERRATA_N2_2242400``: This applies errata 2242400 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2280757``: This applies errata 2280757 workaround to Neoverse-N2 - ``ERRATA_N2_2280757``: This applies errata 2280757 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU and is still open. CPU. This needs to be enabled for revision r0p0 of the CPU and is fixed in r0p1.
- ``ERRATA_N2_2326639``: This applies errata 2326639 workaround to Neoverse-N2 - ``ERRATA_N2_2326639``: This applies errata 2326639 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU, it is fixed in CPU. This needs to be enabled for revision r0p0 of the CPU, it is fixed in
r0p1. r0p1.
- ``ERRATA_N2_2376738``: This applies errata 2376738 workaround to Neoverse-N2 - ``ERRATA_N2_2376738``: This applies errata 2376738 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU, it is fixed in CPU. This needs to be enabled for revision r0p0, r0p1, r0p2, r0p3 and is still open.
r0p1.
- ``ERRATA_N2_2388450``: This applies errata 2388450 workaround to Neoverse-N2 - ``ERRATA_N2_2388450``: This applies errata 2388450 workaround to Neoverse-N2
CPU. This needs to be enabled for revision r0p0 of the CPU, it is fixed in CPU. This needs to be enabled for revision r0p0 of the CPU, it is fixed in
r0p1. r0p1.
- ``ERRATA_N2_2743014``: This applies errata 2743014 workaround to Neoverse-N2
CPU. This needs to be enabled for revisions r0p0, r0p1 and r0p2. It is fixed
in r0p3.
- ``ERRATA_N2_2743089``: This applies errata 2743089 workaround to Neoverse-N2 - ``ERRATA_N2_2743089``: This applies errata 2743089 workaround to Neoverse-N2
CPU. This needs to be enabled for revisions r0p0, r0p1 and r0p2. It is fixed CPU. This needs to be enabled for revisions r0p0, r0p1 and r0p2. It is fixed
in r0p3. in r0p3.
@ -651,6 +654,10 @@ For Neoverse N2, the following errata build flags are defined :
interconnect IP. This needs to be enabled for revisions r0p0, r0p1 and r0p2. interconnect IP. This needs to be enabled for revisions r0p0, r0p1 and r0p2.
It is fixed in r0p3. It is fixed in r0p3.
- ``ERRATA_N2_2779511``: This applies errata 2779511 workaround to Neoverse-N2
CPU. This needs to be enabled for revisions r0p0, r0p1 and r0p2. It is fixed
in r0p3.
For Cortex-X2, the following errata build flags are defined : For Cortex-X2, the following errata build flags are defined :
- ``ERRATA_X2_2002765``: This applies errata 2002765 workaround to Cortex-X2 - ``ERRATA_X2_2002765``: This applies errata 2002765 workaround to Cortex-X2

8
include/lib/cpus/aarch64/neoverse_n2.h
View file

@ -42,10 +42,18 @@
#define NEOVERSE_N2_CPUACTLR2_EL1_BIT_36 (ULL(1) << 36) #define NEOVERSE_N2_CPUACTLR2_EL1_BIT_36 (ULL(1) << 36)
#define NEOVERSE_N2_CPUACTLR2_EL1_BIT_40 (ULL(1) << 40) #define NEOVERSE_N2_CPUACTLR2_EL1_BIT_40 (ULL(1) << 40)
/*******************************************************************************
* CPU Auxiliary Control register 3 specific definitions.
******************************************************************************/
#define NEOVERSE_N2_CPUACTLR3_EL1 S3_0_C15_C1_2
#define NEOVERSE_N2_CPUACTLR3_EL1_BIT_47 (ULL(1) << 47)
/******************************************************************************* /*******************************************************************************
* CPU Auxiliary Control register 5 specific definitions. * CPU Auxiliary Control register 5 specific definitions.
******************************************************************************/ ******************************************************************************/
#define NEOVERSE_N2_CPUACTLR5_EL1 S3_0_C15_C8_0 #define NEOVERSE_N2_CPUACTLR5_EL1 S3_0_C15_C8_0
#define NEOVERSE_N2_CPUACTLR5_EL1_BIT_56 (ULL(1) << 56)
#define NEOVERSE_N2_CPUACTLR5_EL1_BIT_55 (ULL(1) << 55)
#define NEOVERSE_N2_CPUACTLR5_EL1_BIT_44 (ULL(1) << 44) #define NEOVERSE_N2_CPUACTLR5_EL1_BIT_44 (ULL(1) << 44)
#define NEOVERSE_N2_CPUACTLR5_EL1_BIT_13 (ULL(1) << 13) #define NEOVERSE_N2_CPUACTLR5_EL1_BIT_13 (ULL(1) << 13)
#define NEOVERSE_N2_CPUACTLR5_EL1_BIT_17 (ULL(1) << 17) #define NEOVERSE_N2_CPUACTLR5_EL1_BIT_17 (ULL(1) << 17)

607
lib/cpus/aarch64/neoverse_n2.S
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2022, Arm Limited. All rights reserved. * Copyright (c) 2020-2023, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -24,20 +24,17 @@
wa_cve_2022_23960_bhb_vector_table NEOVERSE_N2_BHB_LOOP_COUNT, neoverse_n2 wa_cve_2022_23960_bhb_vector_table NEOVERSE_N2_BHB_LOOP_COUNT, neoverse_n2
#endif /* WORKAROUND_CVE_2022_23960 */ #endif /* WORKAROUND_CVE_2022_23960 */
/* -------------------------------------------------- /*
* Errata Workaround for Neoverse N2 Erratum 2002655. * ERRATA_DSU_2313941:
* This applies to revision r0p0 of Neoverse N2. it is still open. * The errata is defined in dsu_helpers.S and applies to Neoverse N2.
* Inputs: * Henceforth creating symbolic names to the already existing errata
* x0: variant[4:7] and revision[0:3] of current cpu. * workaround functions to get them registered under the Errata Framework.
* Shall clobber: x0-x17
* --------------------------------------------------
*/ */
func errata_n2_2002655_wa .equ check_erratum_neoverse_n2_2313941, check_errata_dsu_2313941
/* Check revision. */ .equ erratum_neoverse_n2_2313941_wa, errata_dsu_2313941_wa
mov x17, x30 add_erratum_entry neoverse_n2, ERRATUM(2313941), ERRATA_DSU_2313941, APPLY_AT_RESET
bl check_errata_2002655
cbz x0, 1f
workaround_reset_start neoverse_n2, ERRATUM(2002655), ERRATA_N2_2002655
/* Apply instruction patching sequence */ /* Apply instruction patching sequence */
ldr x0,=0x6 ldr x0,=0x6
msr S3_6_c15_c8_0,x0 msr S3_6_c15_c8_0,x0
@ -55,111 +52,33 @@ func errata_n2_2002655_wa
msr S3_6_c15_c8_3,x0 msr S3_6_c15_c8_3,x0
ldr x0,=0x40000001003f3 ldr x0,=0x40000001003f3
msr S3_6_c15_c8_1,x0 msr S3_6_c15_c8_1,x0
isb workaround_reset_end neoverse_n2, ERRATUM(2002655)
1:
ret x17
endfunc errata_n2_2002655_wa
func check_errata_2002655 check_erratum_ls neoverse_n2, ERRATUM(2002655), CPU_REV(0, 0)
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2002655
/* --------------------------------------------------------------- workaround_reset_start neoverse_n2, ERRATUM(2025414), ERRATA_N2_2025414
* Errata Workaround for Neoverse N2 Erratum 2067956. sysreg_bit_set NEOVERSE_N2_CPUECTLR_EL1, NEOVERSE_N2_CPUECTLR_EL1_PFSTIDIS_BIT
* This applies to revision r0p0 of Neoverse N2 and is still open. workaround_reset_end neoverse_n2, ERRATUM(2025414)
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x17
* ---------------------------------------------------------------
*/
func errata_n2_2067956_wa
/* Compare x0 against revision r0p0 */
mov x17, x30
bl check_errata_2067956
cbz x0, 1f
mrs x1, NEOVERSE_N2_CPUACTLR_EL1
orr x1, x1, NEOVERSE_N2_CPUACTLR_EL1_BIT_46
msr NEOVERSE_N2_CPUACTLR_EL1, x1
1:
ret x17
endfunc errata_n2_2067956_wa
func check_errata_2067956 check_erratum_ls neoverse_n2, ERRATUM(2025414), CPU_REV(0, 0)
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2067956
/* --------------------------------------------------------------- workaround_reset_start neoverse_n2, ERRATUM(2067956), ERRATA_N2_2067956
* Errata Workaround for Neoverse N2 Erratum 2025414. sysreg_bit_set NEOVERSE_N2_CPUACTLR_EL1, NEOVERSE_N2_CPUACTLR_EL1_BIT_46
* This applies to revision r0p0 of Neoverse N2 and is still open. workaround_reset_end neoverse_n2, ERRATUM(2067956)
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x17
* ---------------------------------------------------------------
*/
func errata_n2_2025414_wa
/* Compare x0 against revision r0p0 */
mov x17, x30
bl check_errata_2025414
cbz x0, 1f
mrs x1, NEOVERSE_N2_CPUECTLR_EL1
orr x1, x1, NEOVERSE_N2_CPUECTLR_EL1_PFSTIDIS_BIT
msr NEOVERSE_N2_CPUECTLR_EL1, x1
1: check_erratum_ls neoverse_n2, ERRATUM(2067956), CPU_REV(0, 0)
ret x17
endfunc errata_n2_2025414_wa
func check_errata_2025414 workaround_reset_start neoverse_n2, ERRATUM(2138953), ERRATA_N2_2138953
/* Applies to r0p0 */ /* Apply instruction patching sequence */
mov x1, #0x00 mrs x1, NEOVERSE_N2_CPUECTLR2_EL1
b cpu_rev_var_ls mov x0, #NEOVERSE_N2_CPUECTLR2_EL1_PF_MODE_CNSRV
endfunc check_errata_2025414 bfi x1, x0, #CPUECTLR2_EL1_PF_MODE_LSB, #CPUECTLR2_EL1_PF_MODE_WIDTH
msr NEOVERSE_N2_CPUECTLR2_EL1, x1
workaround_reset_end neoverse_n2, ERRATUM(2138953)
/* --------------------------------------------------------------- check_erratum_ls neoverse_n2, ERRATUM(2138953), CPU_REV(0, 3)
* Errata Workaround for Neoverse N2 Erratum 2189731.
* This applies to revision r0p0 of Neoverse N2 and is still open.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x17
* ---------------------------------------------------------------
*/
func errata_n2_2189731_wa
/* Compare x0 against revision r0p0 */
mov x17, x30
bl check_errata_2189731
cbz x0, 1f
mrs x1, NEOVERSE_N2_CPUACTLR5_EL1
orr x1, x1, NEOVERSE_N2_CPUACTLR5_EL1_BIT_44
msr NEOVERSE_N2_CPUACTLR5_EL1, x1
1:
ret x17
endfunc errata_n2_2189731_wa
func check_errata_2189731
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2189731
/* --------------------------------------------------
* Errata Workaround for Neoverse N2 Erratum 2138956.
* This applies to revision r0p0 of Neoverse N2. it is still open.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x17
* --------------------------------------------------
*/
func errata_n2_2138956_wa
/* Check revision. */
mov x17, x30
bl check_errata_2138956
cbz x0, 1f
workaround_reset_start neoverse_n2, ERRATUM(2138956), ERRATA_N2_2138956
/* Apply instruction patching sequence */ /* Apply instruction patching sequence */
ldr x0,=0x3 ldr x0,=0x3
msr S3_6_c15_c8_0,x0 msr S3_6_c15_c8_0,x0
@ -177,120 +96,27 @@ func errata_n2_2138956_wa
msr S3_6_c15_c8_3,x0 msr S3_6_c15_c8_3,x0
ldr x0,=0x10002001003F3 ldr x0,=0x10002001003F3
msr S3_6_c15_c8_1,x0 msr S3_6_c15_c8_1,x0
isb workaround_reset_end neoverse_n2, ERRATUM(2138956)
1:
ret x17
endfunc errata_n2_2138956_wa
func check_errata_2138956 check_erratum_ls neoverse_n2, ERRATUM(2138956), CPU_REV(0, 0)
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2138956
/* --------------------------------------------------
* Errata Workaround for Neoverse N2 Erratum 2242415.
* This applies to revision r0p0 of Neoverse N2. it is still open.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x1, x17
* --------------------------------------------------
*/
func errata_n2_2242415_wa
/* Check revision. */
mov x17, x30
bl check_errata_2242415
cbz x0, 1f
workaround_reset_start neoverse_n2, ERRATUM(2138958), ERRATA_N2_2138958
/* Apply instruction patching sequence */ /* Apply instruction patching sequence */
mrs x1, NEOVERSE_N2_CPUACTLR_EL1 sysreg_bit_set NEOVERSE_N2_CPUACTLR5_EL1, NEOVERSE_N2_CPUACTLR5_EL1_BIT_13
orr x1, x1, NEOVERSE_N2_CPUACTLR_EL1_BIT_22 workaround_reset_end neoverse_n2, ERRATUM(2138958)
msr NEOVERSE_N2_CPUACTLR_EL1, x1
1:
ret x17
endfunc errata_n2_2242415_wa
func check_errata_2242415 check_erratum_ls neoverse_n2, ERRATUM(2138958), CPU_REV(0, 0)
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2242415
/* -------------------------------------------------- workaround_reset_start neoverse_n2, ERRATUM(2189731), ERRATA_N2_2189731
* Errata Workaround for Neoverse N2 Erratum 2138953. sysreg_bit_set NEOVERSE_N2_CPUACTLR5_EL1, NEOVERSE_N2_CPUACTLR5_EL1_BIT_44
* This applies to revision r0p0 of Neoverse N2. it is still open. workaround_reset_end neoverse_n2, ERRATUM(2189731)
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x1, x17
* --------------------------------------------------
*/
func errata_n2_2138953_wa
/* Check revision. */
mov x17, x30
bl check_errata_2138953
cbz x0, 1f
check_erratum_ls neoverse_n2, ERRATUM(2189731), CPU_REV(0, 0)
workaround_reset_start neoverse_n2, ERRATUM(2242400), ERRATA_N2_2242400
/* Apply instruction patching sequence */ /* Apply instruction patching sequence */
mrs x1, NEOVERSE_N2_CPUECTLR2_EL1 sysreg_bit_set NEOVERSE_N2_CPUACTLR5_EL1, NEOVERSE_N2_CPUACTLR5_EL1_BIT_17
mov x0, #NEOVERSE_N2_CPUECTLR2_EL1_PF_MODE_CNSRV
bfi x1, x0, #CPUECTLR2_EL1_PF_MODE_LSB, #CPUECTLR2_EL1_PF_MODE_WIDTH
msr NEOVERSE_N2_CPUECTLR2_EL1, x1
1:
ret x17
endfunc errata_n2_2138953_wa
func check_errata_2138953
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2138953
/* --------------------------------------------------
* Errata Workaround for Neoverse N2 Erratum 2138958.
* This applies to revision r0p0 of Neoverse N2. it is still open.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x1, x17
* --------------------------------------------------
*/
func errata_n2_2138958_wa
/* Check revision. */
mov x17, x30
bl check_errata_2138958
cbz x0, 1f
/* Apply instruction patching sequence */
mrs x1, NEOVERSE_N2_CPUACTLR5_EL1
orr x1, x1, NEOVERSE_N2_CPUACTLR5_EL1_BIT_13
msr NEOVERSE_N2_CPUACTLR5_EL1, x1
1:
ret x17
endfunc errata_n2_2138958_wa
func check_errata_2138958
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2138958
/* --------------------------------------------------
* Errata Workaround for Neoverse N2 Erratum 2242400.
* This applies to revision r0p0 of Neoverse N2. it is still open.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x1, x17
* --------------------------------------------------
*/
func errata_n2_2242400_wa
/* Check revision. */
mov x17, x30
bl check_errata_2242400
cbz x0, 1f
/* Apply instruction patching sequence */
mrs x1, NEOVERSE_N2_CPUACTLR5_EL1
orr x1, x1, NEOVERSE_N2_CPUACTLR5_EL1_BIT_17
msr NEOVERSE_N2_CPUACTLR5_EL1, x1
ldr x0, =0x2 ldr x0, =0x2
msr S3_6_c15_c8_0, x0 msr S3_6_c15_c8_0, x0
ldr x0, =0x10F600E000 ldr x0, =0x10F600E000
@ -299,174 +125,86 @@ func errata_n2_2242400_wa
msr S3_6_c15_c8_3, x0 msr S3_6_c15_c8_3, x0
ldr x0, =0x80000000003FF ldr x0, =0x80000000003FF
msr S3_6_c15_c8_1, x0 msr S3_6_c15_c8_1, x0
isb workaround_reset_end neoverse_n2, ERRATUM(2242400)
1:
ret x17
endfunc errata_n2_2242400_wa
func check_errata_2242400 check_erratum_ls neoverse_n2, ERRATUM(2242400), CPU_REV(0, 0)
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2242400
/* -------------------------------------------------- workaround_reset_start neoverse_n2, ERRATUM(2242415), ERRATA_N2_2242415
* Errata Workaround for Neoverse N2 Erratum 2280757. sysreg_bit_set NEOVERSE_N2_CPUACTLR_EL1, NEOVERSE_N2_CPUACTLR_EL1_BIT_22
* This applies to revision r0p0 of Neoverse N2. it is still open. workaround_reset_end neoverse_n2, ERRATUM(2242415)
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x1, x17
* --------------------------------------------------
*/
func errata_n2_2280757_wa
/* Check revision. */
mov x17, x30
bl check_errata_2280757
cbz x0, 1f
check_erratum_ls neoverse_n2, ERRATUM(2242415), CPU_REV(0, 0)
workaround_reset_start neoverse_n2, ERRATUM(2280757), ERRATA_N2_2280757
/* Apply instruction patching sequence */ /* Apply instruction patching sequence */
mrs x1, NEOVERSE_N2_CPUACTLR_EL1 sysreg_bit_set NEOVERSE_N2_CPUACTLR_EL1, NEOVERSE_N2_CPUACTLR_EL1_BIT_22
orr x1, x1, NEOVERSE_N2_CPUACTLR_EL1_BIT_22 workaround_reset_end neoverse_n2, ERRATUM(2280757)
msr NEOVERSE_N2_CPUACTLR_EL1, x1
1:
ret x17
endfunc errata_n2_2280757_wa
func check_errata_2280757 check_erratum_ls neoverse_n2, ERRATUM(2280757), CPU_REV(0, 0)
/* Applies to r0p0 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2280757
/* --------------------------------------------------
* Errata Workaround for Neoverse N2 Erratum 2326639.
* This applies to revision r0p0 of Neoverse N2,
* fixed in r0p1.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x1, x17
* --------------------------------------------------
*/
func errata_n2_2326639_wa
/* Check revision. */
mov x17, x30
bl check_errata_2326639
cbz x0, 1f
workaround_runtime_start neoverse_n2, ERRATUM(2326639), ERRATA_N2_2326639
/* Set bit 36 in ACTLR2_EL1 */ /* Set bit 36 in ACTLR2_EL1 */
mrs x1, NEOVERSE_N2_CPUACTLR2_EL1 sysreg_bit_set NEOVERSE_N2_CPUACTLR2_EL1, NEOVERSE_N2_CPUACTLR2_EL1_BIT_36
orr x1, x1, #NEOVERSE_N2_CPUACTLR2_EL1_BIT_36 workaround_runtime_end neoverse_n2, ERRATUM(2326639)
msr NEOVERSE_N2_CPUACTLR2_EL1, x1
1:
ret x17
endfunc errata_n2_2326639_wa
func check_errata_2326639 check_erratum_ls neoverse_n2, ERRATUM(2326639), CPU_REV(0, 0)
/* Applies to r0p0, fixed in r0p1 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2326639
/* --------------------------------------------------
* Errata Workaround for Neoverse N2 Erratum 2376738.
* This applies to revision r0p0 of Neoverse N2,
* fixed in r0p1.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current CPU.
* Shall clobber: x0-x1, x17
* --------------------------------------------------
*/
func errata_n2_2376738_wa
mov x17, x30
bl check_errata_2376738
cbz x0, 1f
workaround_reset_start neoverse_n2, ERRATUM(2376738), ERRATA_N2_2376738
/* Set CPUACTLR2_EL1[0] to 1 to force PLDW/PFRM /* Set CPUACTLR2_EL1[0] to 1 to force PLDW/PFRM
* ST to behave like PLD/PFRM LD and not cause * ST to behave like PLD/PFRM LD and not cause
* invalidations to other PE caches. * invalidations to other PE caches.
*/ */
mrs x1, NEOVERSE_N2_CPUACTLR2_EL1 sysreg_bit_set NEOVERSE_N2_CPUACTLR2_EL1, NEOVERSE_N2_CPUACTLR2_EL1_BIT_0
orr x1, x1, NEOVERSE_N2_CPUACTLR2_EL1_BIT_0 workaround_reset_end neoverse_n2, ERRATUM(2376738)
msr NEOVERSE_N2_CPUACTLR2_EL1, x1
1:
ret x17
endfunc errata_n2_2376738_wa
func check_errata_2376738 check_erratum_ls neoverse_n2, ERRATUM(2376738), CPU_REV(0, 3)
/* Applies to r0p0, fixed in r0p1 */
mov x1, 0x00
b cpu_rev_var_ls
endfunc check_errata_2376738
/* --------------------------------------------------
* Errata Workaround for Neoverse N2 Erratum 2388450.
* This applies to revision r0p0 of Neoverse N2,
* fixed in r0p1.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Shall clobber: x0-x1, x17
* --------------------------------------------------
*/
func errata_n2_2388450_wa
/* Check revision. */
mov x17, x30
bl check_errata_2388450
cbz x0, 1f
workaround_reset_start neoverse_n2, ERRATUM(2388450), ERRATA_N2_2388450
/*Set bit 40 in ACTLR2_EL1 */ /*Set bit 40 in ACTLR2_EL1 */
mrs x1, NEOVERSE_N2_CPUACTLR2_EL1 sysreg_bit_set NEOVERSE_N2_CPUACTLR2_EL1, NEOVERSE_N2_CPUACTLR2_EL1_BIT_40
orr x1, x1, #NEOVERSE_N2_CPUACTLR2_EL1_BIT_40 workaround_reset_end neoverse_n2, ERRATUM(2388450)
msr NEOVERSE_N2_CPUACTLR2_EL1, x1
isb
1:
ret x17
endfunc errata_n2_2388450_wa
func check_errata_2388450 check_erratum_ls neoverse_n2, ERRATUM(2388450), CPU_REV(0, 0)
/* Applies to r0p0, fixed in r0p1 */
mov x1, #0x00
b cpu_rev_var_ls
endfunc check_errata_2388450
/* ------------------------------------------------------- workaround_reset_start neoverse_n2, ERRATUM(2743014), ERRATA_N2_2743014
* Errata Workaround for Neoverse N2 Erratum 2743089. /* Set CPUACTLR5_EL1[56:55] to 2'b01 */
* This applies to revisions <= r0p2 and is fixed in r0p3. sysreg_bit_set NEOVERSE_N2_CPUACTLR5_EL1, NEOVERSE_N2_CPUACTLR5_EL1_BIT_55
* x0: variant[4:7] and revision[0:3] of current cpu. sysreg_bit_clear NEOVERSE_N2_CPUACTLR5_EL1, NEOVERSE_N2_CPUACTLR5_EL1_BIT_56
* Shall clobber: x0-x17 workaround_reset_end neoverse_n2, ERRATUM(2743014)
* -------------------------------------------------------
*/
func errata_n2_2743089_wa
mov x17, x30
bl check_errata_2743089
cbz x0, 1f
check_erratum_ls neoverse_n2, ERRATUM(2743014), CPU_REV(0, 2)
workaround_runtime_start neoverse_n2, ERRATUM(2743089), ERRATA_N2_2743089
/* dsb before isb of power down sequence */ /* dsb before isb of power down sequence */
dsb sy dsb sy
1: workaround_runtime_end neoverse_n2, ERRATUM(2743089)
ret x17
endfunc errata_n2_2743089_wa
func check_errata_2743089 check_erratum_ls neoverse_n2, ERRATUM(2743089), CPU_REV(0, 2)
/* Applies to all revisions <= r0p2 */
mov x1, #0x02
b cpu_rev_var_ls
endfunc check_errata_2743089
func check_errata_cve_2022_23960 workaround_reset_start neoverse_n2, ERRATUM(2779511), ERRATA_N2_2779511
#if WORKAROUND_CVE_2022_23960 /* Set bit 47 in ACTLR3_EL1 */
mov x0, #ERRATA_APPLIES sysreg_bit_set NEOVERSE_N2_CPUACTLR3_EL1, NEOVERSE_N2_CPUACTLR3_EL1_BIT_47
#else workaround_reset_end neoverse_n2, ERRATUM(2779511)
mov x0, #ERRATA_MISSING
#endif check_erratum_ls neoverse_n2, ERRATUM(2779511), CPU_REV(0, 2)
ret
endfunc check_errata_cve_2022_23960 workaround_reset_start neoverse_n2, CVE(2022,23960), WORKAROUND_CVE_2022_23960
#if IMAGE_BL31
/*
* The Neoverse-N2 generic vectors are overridden to apply errata
* mitigation on exception entry from lower ELs.
*/
override_vector_table wa_cve_vbar_neoverse_n2
#endif /* IMAGE_BL31 */
workaround_reset_end neoverse_n2, CVE(2022,23960)
check_erratum_chosen neoverse_n2, CVE(2022, 23960), WORKAROUND_CVE_2022_23960
/* ------------------------------------------- /* -------------------------------------------
* The CPU Ops reset function for Neoverse N2. * The CPU Ops reset function for Neoverse N2.
* ------------------------------------------- * -------------------------------------------
*/ */
func neoverse_n2_reset_func cpu_reset_func_start neoverse_n2
mov x19, x30
/* Check if the PE implements SSBS */ /* Check if the PE implements SSBS */
mrs x0, id_aa64pfr1_el1 mrs x0, id_aa64pfr1_el1
@ -477,174 +215,39 @@ func neoverse_n2_reset_func
msr SSBS, xzr msr SSBS, xzr
1: 1:
/* Force all cacheable atomic instructions to be near */ /* Force all cacheable atomic instructions to be near */
mrs x0, NEOVERSE_N2_CPUACTLR2_EL1 sysreg_bit_set NEOVERSE_N2_CPUACTLR2_EL1, NEOVERSE_N2_CPUACTLR2_EL1_BIT_2
orr x0, x0, #NEOVERSE_N2_CPUACTLR2_EL1_BIT_2
msr NEOVERSE_N2_CPUACTLR2_EL1, x0
/* Get the CPU revision and stash it in x18. */
bl cpu_get_rev_var
mov x18, x0
#if ERRATA_DSU_2313941
bl errata_dsu_2313941_wa
#endif
#if ERRATA_N2_2067956
mov x0, x18
bl errata_n2_2067956_wa
#endif
#if ERRATA_N2_2025414
mov x0, x18
bl errata_n2_2025414_wa
#endif
#if ERRATA_N2_2189731
mov x0, x18
bl errata_n2_2189731_wa
#endif
#if ERRATA_N2_2138956
mov x0, x18
bl errata_n2_2138956_wa
#endif
#if ERRATA_N2_2138953
mov x0, x18
bl errata_n2_2138953_wa
#endif
#if ERRATA_N2_2242415
mov x0, x18
bl errata_n2_2242415_wa
#endif
#if ERRATA_N2_2138958
mov x0, x18
bl errata_n2_2138958_wa
#endif
#if ERRATA_N2_2242400
mov x0, x18
bl errata_n2_2242400_wa
#endif
#if ERRATA_N2_2280757
mov x0, x18
bl errata_n2_2280757_wa
#endif
#if ERRATA_N2_2376738
mov x0, x18
bl errata_n2_2376738_wa
#endif
#if ERRATA_N2_2388450
mov x0, x18
bl errata_n2_2388450_wa
#endif
#if ENABLE_FEAT_AMU #if ENABLE_FEAT_AMU
/* Make sure accesses from EL0/EL1 and EL2 are not trapped to EL3 */ /* Make sure accesses from EL0/EL1 and EL2 are not trapped to EL3 */
mrs x0, cptr_el3 sysreg_bit_set cptr_el3, TAM_BIT
orr x0, x0, #TAM_BIT
msr cptr_el3, x0
/* Make sure accesses from EL0/EL1 are not trapped to EL2 */ /* Make sure accesses from EL0/EL1 are not trapped to EL2 */
mrs x0, cptr_el2 sysreg_bit_set cptr_el2, TAM_BIT
orr x0, x0, #TAM_BIT
msr cptr_el2, x0
/* No need to enable the counters as this would be done at el3 exit */ /* No need to enable the counters as this would be done at el3 exit */
#endif #endif
#if NEOVERSE_Nx_EXTERNAL_LLC #if NEOVERSE_Nx_EXTERNAL_LLC
/* Some systems may have External LLC, core needs to be made aware */ /* Some systems may have External LLC, core needs to be made aware */
mrs x0, NEOVERSE_N2_CPUECTLR_EL1 sysreg_bit_set NEOVERSE_N2_CPUECTLR_EL1, NEOVERSE_N2_CPUECTLR_EL1_EXTLLC_BIT
orr x0, x0, NEOVERSE_N2_CPUECTLR_EL1_EXTLLC_BIT
msr NEOVERSE_N2_CPUECTLR_EL1, x0
#endif #endif
cpu_reset_func_end neoverse_n2
#if ERRATA_N2_2002655
mov x0, x18
bl errata_n2_2002655_wa
#endif
#if IMAGE_BL31 && WORKAROUND_CVE_2022_23960
/*
* The Neoverse-N2 generic vectors are overridden to apply errata
* mitigation on exception entry from lower ELs.
*/
adr x0, wa_cve_vbar_neoverse_n2
msr vbar_el3, x0
#endif /* IMAGE_BL31 && WORKAROUND_CVE_2022_23960 */
isb
ret x19
endfunc neoverse_n2_reset_func
func neoverse_n2_core_pwr_dwn func neoverse_n2_core_pwr_dwn
#if ERRATA_N2_2326639
mov x15, x30
bl cpu_get_rev_var
bl errata_n2_2326639_wa
mov x30, x15
#endif /* ERRATA_N2_2326639 */
apply_erratum neoverse_n2, ERRATUM(2326639), ERRATA_N2_2326639
/* --------------------------------------------------- /* ---------------------------------------------------
* Enable CPU power down bit in power control register * Enable CPU power down bit in power control register
* No need to do cache maintenance here. * No need to do cache maintenance here.
* --------------------------------------------------- * ---------------------------------------------------
*/ */
mrs x0, NEOVERSE_N2_CPUPWRCTLR_EL1 sysreg_bit_set NEOVERSE_N2_CPUPWRCTLR_EL1, NEOVERSE_N2_CORE_PWRDN_EN_BIT
orr x0, x0, #NEOVERSE_N2_CORE_PWRDN_EN_BIT
msr NEOVERSE_N2_CPUPWRCTLR_EL1, x0 apply_erratum neoverse_n2, ERRATUM(2743089), ERRATA_N2_2743089
#if ERRATA_N2_2743089
mov x15, x30
bl cpu_get_rev_var
bl errata_n2_2743089_wa
mov x30, x15
#endif /* ERRATA_N2_2743089 */
isb isb
ret ret
endfunc neoverse_n2_core_pwr_dwn endfunc neoverse_n2_core_pwr_dwn
#if REPORT_ERRATA errata_report_shim neoverse_n2
/*
* Errata printing function for Neoverse N2 cores. Must follow AAPCS.
*/
func neoverse_n2_errata_report
stp x8, x30, [sp, #-16]!
bl cpu_get_rev_var
mov x8, x0
/*
* Report all errata. The revision-variant information is passed to
* checking functions of each errata.
*/
report_errata ERRATA_N2_2002655, neoverse_n2, 2002655
report_errata ERRATA_N2_2067956, neoverse_n2, 2067956
report_errata ERRATA_N2_2025414, neoverse_n2, 2025414
report_errata ERRATA_N2_2189731, neoverse_n2, 2189731
report_errata ERRATA_N2_2138956, neoverse_n2, 2138956
report_errata ERRATA_N2_2138953, neoverse_n2, 2138953
report_errata ERRATA_N2_2242415, neoverse_n2, 2242415
report_errata ERRATA_N2_2138958, neoverse_n2, 2138958
report_errata ERRATA_N2_2242400, neoverse_n2, 2242400
report_errata ERRATA_N2_2280757, neoverse_n2, 2280757
report_errata ERRATA_N2_2326639, neoverse_n2, 2326639
report_errata ERRATA_N2_2376738, neoverse_n2, 2376738
report_errata ERRATA_N2_2388450, neoverse_n2, 2388450
report_errata ERRATA_N2_2743089, neoverse_n2, 2743089
report_errata WORKAROUND_CVE_2022_23960, neoverse_n2, cve_2022_23960
report_errata ERRATA_DSU_2313941, neoverse_n2, dsu_2313941
ldp x8, x30, [sp], #16
ret
endfunc neoverse_n2_errata_report
#endif
/* --------------------------------------------- /* ---------------------------------------------
* This function provides Neoverse N2 specific * This function provides Neoverse N2 specific

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

@ -612,43 +612,43 @@ CPU_FLAG_LIST += ERRATA_A710_2701952
CPU_FLAG_LIST += ERRATA_A710_2768515 CPU_FLAG_LIST += ERRATA_A710_2768515
# Flag to apply erratum 2002655 workaround during reset. This erratum applies # Flag to apply erratum 2002655 workaround during reset. This erratum applies
# to revisions r0p0 of the Neoverse-N2 cpu, it is still open. # to revisions r0p0 of the Neoverse-N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2002655 CPU_FLAG_LIST += ERRATA_N2_2002655
# Flag to apply erratum 2067956 workaround during reset. This erratum applies # Flag to apply erratum 2067956 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0 of the Neoverse N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2067956 CPU_FLAG_LIST += ERRATA_N2_2067956
# Flag to apply erratum 2025414 workaround during reset. This erratum applies # Flag to apply erratum 2025414 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0 of the Neoverse N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2025414 CPU_FLAG_LIST += ERRATA_N2_2025414
# Flag to apply erratum 2189731 workaround during reset. This erratum applies # Flag to apply erratum 2189731 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0 of the Neoverse N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2189731 CPU_FLAG_LIST += ERRATA_N2_2189731
# Flag to apply erratum 2138956 workaround during reset. This erratum applies # Flag to apply erratum 2138956 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0 of the Neoverse N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2138956 CPU_FLAG_LIST += ERRATA_N2_2138956
# Flag to apply erratum 2138953 workaround during reset. This erratum applies # Flag to apply erratum 2138953 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0, r0p1, r0p2, r0p3 of the Neoverse N2 cpu and is still open.
CPU_FLAG_LIST += ERRATA_N2_2138953 CPU_FLAG_LIST += ERRATA_N2_2138953
# Flag to apply erratum 2242415 workaround during reset. This erratum applies # Flag to apply erratum 2242415 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0 of the Neoverse N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2242415 CPU_FLAG_LIST += ERRATA_N2_2242415
# Flag to apply erratum 2138958 workaround during reset. This erratum applies # Flag to apply erratum 2138958 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0 of the Neoverse N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2138958 CPU_FLAG_LIST += ERRATA_N2_2138958
# Flag to apply erratum 2242400 workaround during reset. This erratum applies # Flag to apply erratum 2242400 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0 of the Neoverse N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2242400 CPU_FLAG_LIST += ERRATA_N2_2242400
# Flag to apply erratum 2280757 workaround during reset. This erratum applies # Flag to apply erratum 2280757 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu and is still open. # to revision r0p0 of the Neoverse N2 cpu and is fixed in r0p1.
CPU_FLAG_LIST += ERRATA_N2_2280757 CPU_FLAG_LIST += ERRATA_N2_2280757
# Flag to apply erraturm 2326639 workaroud during powerdown. This erratum # Flag to apply erraturm 2326639 workaroud during powerdown. This erratum
@ -656,7 +656,7 @@ CPU_FLAG_LIST += ERRATA_N2_2280757
CPU_FLAG_LIST += ERRATA_N2_2326639 CPU_FLAG_LIST += ERRATA_N2_2326639
# Flag to apply erratum 2376738 workaround during reset. This erratum applies # Flag to apply erratum 2376738 workaround during reset. This erratum applies
# to revision r0p0 of the Neoverse N2 cpu, it is fixed in r0p1. # to revision r0p0, r0p1, r0p2, r0p3 of the Neoverse N2 cpu and is still open.
CPU_FLAG_LIST += ERRATA_N2_2376738 CPU_FLAG_LIST += ERRATA_N2_2376738
# Flag to apply erratum 2388450 workaround during reset. This erratum applies # Flag to apply erratum 2388450 workaround during reset. This erratum applies
@ -668,10 +668,18 @@ CPU_FLAG_LIST += ERRATA_N2_2388450
# r0p3. # r0p3.
CPU_FLAG_LIST += ERRATA_N2_2728475 CPU_FLAG_LIST += ERRATA_N2_2728475
# Flag to apply erratum 2743014 workaround during reset. This erratum applies
# to r0p0, r0p1, r0p2 of the Neoverse N2 cpu, it is fixed in r0p3.
CPU_FLAG_LIST += ERRATA_N2_2743014
# Flag to apply erratum 2743089 workaround during during powerdown. This erratum # Flag to apply erratum 2743089 workaround during during powerdown. This erratum
# applies to all revisions <= r0p2 of the Neoverse N2 cpu, it is fixed in r0p3. # applies to all revisions <= r0p2 of the Neoverse N2 cpu, it is fixed in r0p3.
CPU_FLAG_LIST += ERRATA_N2_2743089 CPU_FLAG_LIST += ERRATA_N2_2743089
# Flag to apply erratum 2779511 workaround during reset. This erratum applies
# to r0p0, r0p1, r0p2 of the Neoverse N2 cpu, it is fixed in r0p3.
CPU_FLAG_LIST += ERRATA_N2_2779511
# Flag to apply erratum 2002765 workaround during reset. This erratum applies # Flag to apply erratum 2002765 workaround during reset. This erratum applies
# to revisions r0p0, r1p0, and r2p0 of the Cortex-X2 cpu and is still open. # to revisions r0p0, r1p0, and r2p0 of the Cortex-X2 cpu and is still open.
CPU_FLAG_LIST += ERRATA_X2_2002765 CPU_FLAG_LIST += ERRATA_X2_2002765

2
plat/arm/board/fvp/fvp_cpu_errata.mk
View file

@ -30,6 +30,7 @@ CORTEX_A76_H_INC := 1
CORTEX_A77_H_INC := 1 CORTEX_A77_H_INC := 1
CORTEX_A78_H_INC := 1 CORTEX_A78_H_INC := 1
NEOVERSE_N1_H_INC := 1 NEOVERSE_N1_H_INC := 1
NEOVERSE_N2_H_INC := 1
NEOVERSE_V1_H_INC := 1 NEOVERSE_V1_H_INC := 1
CORTEX_A78_AE_H_INC := 1 CORTEX_A78_AE_H_INC := 1
CORTEX_A510_H_INC := 1 CORTEX_A510_H_INC := 1
@ -41,6 +42,7 @@ $(eval $(call add_define, CORTEX_A76_H_INC))
$(eval $(call add_define, CORTEX_A77_H_INC)) $(eval $(call add_define, CORTEX_A77_H_INC))
$(eval $(call add_define, CORTEX_A78_H_INC)) $(eval $(call add_define, CORTEX_A78_H_INC))
$(eval $(call add_define, NEOVERSE_N1_H_INC)) $(eval $(call add_define, NEOVERSE_N1_H_INC))
$(eval $(call add_define, NEOVERSE_N2_H_INC))
$(eval $(call add_define, NEOVERSE_V1_H_INC)) $(eval $(call add_define, NEOVERSE_V1_H_INC))
$(eval $(call add_define, CORTEX_A78_AE_H_INC)) $(eval $(call add_define, CORTEX_A78_AE_H_INC))
$(eval $(call add_define, CORTEX_A510_H_INC)) $(eval $(call add_define, CORTEX_A510_H_INC))

2
services/std_svc/errata_abi/cpu_errata_info.h
View file

@ -39,7 +39,7 @@
#include <cortex_a9.h> #include <cortex_a9.h>
#endif #endif
#define MAX_ERRATA_ENTRIES 16 #define MAX_ERRATA_ENTRIES 32
#define ERRATA_LIST_END (MAX_ERRATA_ENTRIES - 1) #define ERRATA_LIST_END (MAX_ERRATA_ENTRIES - 1)

6
services/std_svc/errata_abi/errata_abi_main.c
View file

@ -346,8 +346,10 @@ struct em_cpu_list cpu_list[] = {
[12] = {2388450, 0x00, 0x00, ERRATA_N2_2388450}, [12] = {2388450, 0x00, 0x00, ERRATA_N2_2388450},
[13] = {2728475, 0x00, 0x02, ERRATA_N2_2728475, \ [13] = {2728475, 0x00, 0x02, ERRATA_N2_2728475, \
ERRATA_NON_ARM_INTERCONNECT}, ERRATA_NON_ARM_INTERCONNECT},
[14] = {2743089, 0x00, 0x02, ERRATA_N2_2743089}, [14] = {2743014, 0x00, 0x02, ERRATA_N2_2743014},
[15 ... ERRATA_LIST_END] = UNDEF_ERRATA, [15] = {2743089, 0x00, 0x02, ERRATA_N2_2743089},
[16] = {2779511, 0x00, 0x02, ERRATA_N2_2779511},
[17 ... ERRATA_LIST_END] = UNDEF_ERRATA,
} }
}, },
#endif /* NEOVERSE_N2_H_INC */ #endif /* NEOVERSE_N2_H_INC */