Merge "errata: workaround for Cortex-A710 erratum 2083908" into integration
This commit is contained in:
commit
114785c9b2
|
@ -389,6 +389,10 @@ For Cortex-A710, the following errata build flags are defined :
|
||||||
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
|
||||||
of the CPU and is still open.
|
of the CPU and is still open.
|
||||||
|
|
||||||
|
- ``ERRATA_A710_2083908``: This applies errata 2083908 workaround to
|
||||||
|
Cortex-A710 CPU. This needs to be enabled for revision r2p0 of the CPU and
|
||||||
|
is still open.
|
||||||
|
|
||||||
For Neoverse N2, the following errata build flags are defined :
|
For Neoverse N2, the following errata build flags are defined :
|
||||||
|
|
||||||
- ``ERRATA_N2_2067956``: This applies errata 2067956 workaround to Neoverse-N2
|
- ``ERRATA_N2_2067956``: This applies errata 2067956 workaround to Neoverse-N2
|
||||||
|
|
|
@ -27,4 +27,10 @@
|
||||||
#define CORTEX_A710_CPUACTLR_EL1 S3_0_C15_C1_0
|
#define CORTEX_A710_CPUACTLR_EL1 S3_0_C15_C1_0
|
||||||
#define CORTEX_A710_CPUACTLR_EL1_BIT_46 (ULL(1) << 46)
|
#define CORTEX_A710_CPUACTLR_EL1_BIT_46 (ULL(1) << 46)
|
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
* CPU Auxiliary Control register specific definitions.
|
||||||
|
******************************************************************************/
|
||||||
|
#define CORTEX_A710_CPUACTLR5_EL1 S3_0_C15_C8_0
|
||||||
|
#define CORTEX_A710_CPUACTLR5_EL1_BIT_13 (ULL(1) << 13)
|
||||||
|
|
||||||
#endif /* CORTEX_A710_H */
|
#endif /* CORTEX_A710_H */
|
||||||
|
|
|
@ -160,6 +160,34 @@ func check_errata_2017096
|
||||||
b cpu_rev_var_ls
|
b cpu_rev_var_ls
|
||||||
endfunc check_errata_2017096
|
endfunc check_errata_2017096
|
||||||
|
|
||||||
|
|
||||||
|
/* ---------------------------------------------------------------------
|
||||||
|
* Errata Workaround for Cortex-A710 Erratum 2083908.
|
||||||
|
* This applies to revision r2p0 of Cortex-A710 and is still open.
|
||||||
|
* Inputs:
|
||||||
|
* x0: variant[4:7] and revision[0:3] of current cpu.
|
||||||
|
* Shall clobber: x0-x17
|
||||||
|
* ---------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
func errata_a710_2083908_wa
|
||||||
|
/* Compare x0 against revision r2p0 */
|
||||||
|
mov x17, x30
|
||||||
|
bl check_errata_2083908
|
||||||
|
cbz x0, 1f
|
||||||
|
mrs x1, CORTEX_A710_CPUACTLR5_EL1
|
||||||
|
orr x1, x1, CORTEX_A710_CPUACTLR5_EL1_BIT_13
|
||||||
|
msr CORTEX_A710_CPUACTLR5_EL1, x1
|
||||||
|
1:
|
||||||
|
ret x17
|
||||||
|
endfunc errata_a710_2083908_wa
|
||||||
|
|
||||||
|
func check_errata_2083908
|
||||||
|
/* Applies to r2p0 */
|
||||||
|
mov x1, #CPU_REV(2, 0)
|
||||||
|
mov x2, #CPU_REV(2, 0)
|
||||||
|
b cpu_rev_var_range
|
||||||
|
endfunc check_errata_2083908
|
||||||
|
|
||||||
/* ----------------------------------------------------
|
/* ----------------------------------------------------
|
||||||
* HW will do the cache maintenance while powering down
|
* HW will do the cache maintenance while powering down
|
||||||
* ----------------------------------------------------
|
* ----------------------------------------------------
|
||||||
|
@ -194,6 +222,7 @@ func cortex_a710_errata_report
|
||||||
report_errata ERRATA_A710_2081180, cortex_a710, 2081180
|
report_errata ERRATA_A710_2081180, cortex_a710, 2081180
|
||||||
report_errata ERRATA_A710_2055002, cortex_a710, 2055002
|
report_errata ERRATA_A710_2055002, cortex_a710, 2055002
|
||||||
report_errata ERRATA_A710_2017096, cortex_a710, 2017096
|
report_errata ERRATA_A710_2017096, cortex_a710, 2017096
|
||||||
|
report_errata ERRATA_A710_2083908, cortex_a710, 2083908
|
||||||
|
|
||||||
ldp x8, x30, [sp], #16
|
ldp x8, x30, [sp], #16
|
||||||
ret
|
ret
|
||||||
|
@ -228,6 +257,11 @@ func cortex_a710_reset_func
|
||||||
mov x0, x18
|
mov x0, x18
|
||||||
bl errata_a710_2017096_wa
|
bl errata_a710_2017096_wa
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ERRATA_A710_2083908
|
||||||
|
mov x0, x18
|
||||||
|
bl errata_a710_2083908_wa
|
||||||
|
#endif
|
||||||
isb
|
isb
|
||||||
ret x19
|
ret x19
|
||||||
endfunc cortex_a710_reset_func
|
endfunc cortex_a710_reset_func
|
||||||
|
|
|
@ -425,6 +425,10 @@ ERRATA_A710_1987031 ?=0
|
||||||
# to revisions r0p0, r1p0 and r2p0 of the Cortex-A710 cpu and is still open.
|
# to revisions r0p0, r1p0 and r2p0 of the Cortex-A710 cpu and is still open.
|
||||||
ERRATA_A710_2081180 ?=0
|
ERRATA_A710_2081180 ?=0
|
||||||
|
|
||||||
|
# Flag to apply erratum 2083908 workaround during reset. This erratum applies
|
||||||
|
# to revision r2p0 of the Cortex-A710 cpu and is still open.
|
||||||
|
ERRATA_A710_2083908 ?=0
|
||||||
|
|
||||||
# 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 still open.
|
||||||
ERRATA_N2_2067956 ?=0
|
ERRATA_N2_2067956 ?=0
|
||||||
|
@ -806,6 +810,10 @@ $(eval $(call add_define,ERRATA_A710_1987031))
|
||||||
$(eval $(call assert_boolean,ERRATA_A710_2081180))
|
$(eval $(call assert_boolean,ERRATA_A710_2081180))
|
||||||
$(eval $(call add_define,ERRATA_A710_2081180))
|
$(eval $(call add_define,ERRATA_A710_2081180))
|
||||||
|
|
||||||
|
# Process ERRATA_A710_2083908 flag
|
||||||
|
$(eval $(call assert_boolean,ERRATA_A710_2083908))
|
||||||
|
$(eval $(call add_define,ERRATA_A710_2083908))
|
||||||
|
|
||||||
# Process ERRATA_N2_2067956 flag
|
# Process ERRATA_N2_2067956 flag
|
||||||
$(eval $(call assert_boolean,ERRATA_N2_2067956))
|
$(eval $(call assert_boolean,ERRATA_N2_2067956))
|
||||||
$(eval $(call add_define,ERRATA_N2_2067956))
|
$(eval $(call add_define,ERRATA_N2_2067956))
|
||||||
|
|
Loading…
Reference in New Issue