fix(errata): workaround for Neoverse-N2 erratum 2242415
Neoverse-N2 erratum 2242415 is a Cat B erratum that applies to revision r0p0 of CPU. It is still open. The workaround is to set CPUACTLR_EL1[22] to 1'b1. Setting CPUACTLR_EL1[22] will cause CFP instruction to invalidate all branch predictor resources regardless of context. SDEN can be found here: https://developer.arm.com/documentation/SDEN1982442/latest Signed-off-by: nayanpatel-arm <nayankumar.patel@arm.com> Change-Id: I442be81fbc32e21fed51a84f59584df17f845e96
This commit is contained in:
nayanpatel-arm
parent
663461b914
commit
5819e23bc4
|
|
@ -340,11 +340,6 @@ For Neoverse N1, the following errata build flags are defined :
|
|||
CPU. This needs to be enabled for revisions r3p0, r3p1, r4p0, and r4p1, for
|
||||
revisions r0p0, r1p0, and r2p0 there is no workaround.
|
||||
|
||||
For Neoverse N2, the following errata build flags are defined :
|
||||
|
||||
- ``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.
|
||||
|
||||
For Neoverse V1, the following errata build flags are defined :
|
||||
|
||||
- ``ERRATA_V1_1774420``: This applies errata 1774420 workaround to Neoverse-V1
|
||||
|
|
@ -407,6 +402,9 @@ For Cortex-A710, 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
|
||||
CPU. This needs to be enabled for revision r0p0 of the CPU, it is still open.
|
||||
|
||||
- ``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.
|
||||
|
||||
|
|
@ -422,6 +420,9 @@ For Neoverse N2, the following errata build flags are defined :
|
|||
- ``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.
|
||||
|
||||
- ``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.
|
||||
|
||||
DSU Errata Workarounds
|
||||
----------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
******************************************************************************/
|
||||
#define NEOVERSE_N2_CPUACTLR_EL1 S3_0_C15_C1_0
|
||||
#define NEOVERSE_N2_CPUACTLR_EL1_BIT_46 (ULL(1) << 46)
|
||||
#define NEOVERSE_N2_CPUACTLR_EL1_BIT_22 (ULL(1) << 22)
|
||||
|
||||
/*******************************************************************************
|
||||
* CPU Auxiliary Control register 2 specific definitions.
|
||||
|
|
|
|||
|
|
@ -183,6 +183,34 @@ func check_errata_2138956
|
|||
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
|
||||
|
||||
/* Apply instruction patching sequence */
|
||||
mrs x1, NEOVERSE_N2_CPUACTLR_EL1
|
||||
orr x1, x1, NEOVERSE_N2_CPUACTLR_EL1_BIT_22
|
||||
msr NEOVERSE_N2_CPUACTLR_EL1, x1
|
||||
1:
|
||||
ret x17
|
||||
endfunc errata_n2_2242415_wa
|
||||
|
||||
func check_errata_2242415
|
||||
/* Applies to r0p0 */
|
||||
mov x1, #0x00
|
||||
b cpu_rev_var_ls
|
||||
endfunc check_errata_2242415
|
||||
|
||||
/* --------------------------------------------------
|
||||
* Errata Workaround for Neoverse N2 Erratum 2138953.
|
||||
* This applies to revision r0p0 of Neoverse N2. it is still open.
|
||||
|
|
@ -258,6 +286,11 @@ func neoverse_n2_reset_func
|
|||
bl errata_n2_2138953_wa
|
||||
#endif
|
||||
|
||||
#if ERRATA_N2_2242415
|
||||
mov x0, x18
|
||||
bl errata_n2_2242415_wa
|
||||
#endif
|
||||
|
||||
#if ENABLE_AMU
|
||||
/* Make sure accesses from EL0/EL1 and EL2 are not trapped to EL3 */
|
||||
mrs x0, cptr_el3
|
||||
|
|
@ -324,6 +357,7 @@ func neoverse_n2_errata_report
|
|||
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
|
||||
|
||||
ldp x8, x30, [sp], #16
|
||||
ret
|
||||
|
|
|
|||
|
|
@ -461,6 +461,10 @@ ERRATA_N2_2138956 ?=0
|
|||
# to revision r0p0 of the Neoverse N2 cpu and is still open.
|
||||
ERRATA_N2_2138953 ?=0
|
||||
|
||||
# Flag to apply erratum 2242415 workaround during reset. This erratum applies
|
||||
# to revision r0p0 of the Neoverse N2 cpu and is still open.
|
||||
ERRATA_N2_2242415 ?=0
|
||||
|
||||
# Flag to apply erratum 2055002 workaround during reset. This erratum applies
|
||||
# to revision r1p0, r2p0 of the Cortex-A710 cpu and is still open.
|
||||
ERRATA_A710_2055002 ?=0
|
||||
|
|
@ -862,6 +866,10 @@ $(eval $(call add_define,ERRATA_N2_2138956))
|
|||
$(eval $(call assert_boolean,ERRATA_N2_2138953))
|
||||
$(eval $(call add_define,ERRATA_N2_2138953))
|
||||
|
||||
# Process ERRATA_N2_2242415 flag
|
||||
$(eval $(call assert_boolean,ERRATA_N2_2242415))
|
||||
$(eval $(call add_define,ERRATA_N2_2242415))
|
||||
|
||||
# Process ERRATA_A710_2055002 flag
|
||||
$(eval $(call assert_boolean,ERRATA_A710_2055002))
|
||||
$(eval $(call add_define,ERRATA_A710_2055002))
|
||||
|
|
|
|||
Loading…
Reference in New Issue