Merge pull request #1883 from ambroise-arm/av/a17-errata
Apply workarounds for errata of Cortex-A17
This commit is contained in:
commit
620d9832f9
|
@ -79,6 +79,14 @@ For Cortex-A15, the following errata build flags are defined :
|
||||||
- ``ERRATA_A15_827671``: This applies errata 827671 workaround to Cortex-A15
|
- ``ERRATA_A15_827671``: This applies errata 827671 workaround to Cortex-A15
|
||||||
CPU. This needs to be enabled only for revision >= r3p0 of the CPU.
|
CPU. This needs to be enabled only for revision >= r3p0 of the CPU.
|
||||||
|
|
||||||
|
For Cortex-A17, the following errata build flags are defined :
|
||||||
|
|
||||||
|
- ``ERRATA_A17_852421``: This applies errata 852421 workaround to Cortex-A17
|
||||||
|
CPU. This needs to be enabled only for revision <= r1p2 of the CPU.
|
||||||
|
|
||||||
|
- ``ERRATA_A17_852423``: This applies errata 852423 workaround to Cortex-A17
|
||||||
|
CPU. This needs to be enabled only for revision <= r1p2 of the CPU.
|
||||||
|
|
||||||
For Cortex-A53, the following errata build flags are defined :
|
For Cortex-A53, the following errata build flags are defined :
|
||||||
|
|
||||||
- ``ERRATA_A53_819472``: This applies errata 819472 workaround to all
|
- ``ERRATA_A53_819472``: This applies errata 819472 workaround to all
|
||||||
|
|
|
@ -19,4 +19,9 @@
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
#define CORTEX_A17_ACTLR_SMP_BIT (U(1) << 6)
|
#define CORTEX_A17_ACTLR_SMP_BIT (U(1) << 6)
|
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
* Implementation defined register specific definitions.
|
||||||
|
******************************************************************************/
|
||||||
|
#define CORTEX_A17_IMP_DEF_REG1 p15, 0, c15, c0, 1
|
||||||
|
|
||||||
#endif /* CORTEX_A17_H */
|
#endif /* CORTEX_A17_H */
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -35,6 +35,62 @@ func cortex_a17_enable_smp
|
||||||
bx lr
|
bx lr
|
||||||
endfunc cortex_a17_enable_smp
|
endfunc cortex_a17_enable_smp
|
||||||
|
|
||||||
|
/* ----------------------------------------------------
|
||||||
|
* Errata Workaround for Cortex A17 Errata #852421.
|
||||||
|
* This applies only to revision <= r1p2 of Cortex A17.
|
||||||
|
* Inputs:
|
||||||
|
* r0: variant[4:7] and revision[0:3] of current cpu.
|
||||||
|
* Shall clobber: r0-r3
|
||||||
|
* ----------------------------------------------------
|
||||||
|
*/
|
||||||
|
func errata_a17_852421_wa
|
||||||
|
/*
|
||||||
|
* Compare r0 against revision r1p2
|
||||||
|
*/
|
||||||
|
mov r2, lr
|
||||||
|
bl check_errata_852421
|
||||||
|
cmp r0, #ERRATA_NOT_APPLIES
|
||||||
|
beq 1f
|
||||||
|
ldcopr r0, CORTEX_A17_IMP_DEF_REG1
|
||||||
|
orr r0, r0, #(1<<24)
|
||||||
|
stcopr r0, CORTEX_A17_IMP_DEF_REG1
|
||||||
|
1:
|
||||||
|
bx r2
|
||||||
|
endfunc errata_a17_852421_wa
|
||||||
|
|
||||||
|
func check_errata_852421
|
||||||
|
mov r1, #0x12
|
||||||
|
b cpu_rev_var_ls
|
||||||
|
endfunc check_errata_852421
|
||||||
|
|
||||||
|
/* ----------------------------------------------------
|
||||||
|
* Errata Workaround for Cortex A17 Errata #852423.
|
||||||
|
* This applies only to revision <= r1p2 of Cortex A17.
|
||||||
|
* Inputs:
|
||||||
|
* r0: variant[4:7] and revision[0:3] of current cpu.
|
||||||
|
* Shall clobber: r0-r3
|
||||||
|
* ----------------------------------------------------
|
||||||
|
*/
|
||||||
|
func errata_a17_852423_wa
|
||||||
|
/*
|
||||||
|
* Compare r0 against revision r1p2
|
||||||
|
*/
|
||||||
|
mov r2, lr
|
||||||
|
bl check_errata_852423
|
||||||
|
cmp r0, #ERRATA_NOT_APPLIES
|
||||||
|
beq 1f
|
||||||
|
ldcopr r0, CORTEX_A17_IMP_DEF_REG1
|
||||||
|
orr r0, r0, #(1<<12)
|
||||||
|
stcopr r0, CORTEX_A17_IMP_DEF_REG1
|
||||||
|
1:
|
||||||
|
bx r2
|
||||||
|
endfunc errata_a17_852423_wa
|
||||||
|
|
||||||
|
func check_errata_852423
|
||||||
|
mov r1, #0x12
|
||||||
|
b cpu_rev_var_ls
|
||||||
|
endfunc check_errata_852423
|
||||||
|
|
||||||
func check_errata_cve_2017_5715
|
func check_errata_cve_2017_5715
|
||||||
#if WORKAROUND_CVE_2017_5715
|
#if WORKAROUND_CVE_2017_5715
|
||||||
mov r0, #ERRATA_APPLIES
|
mov r0, #ERRATA_APPLIES
|
||||||
|
@ -58,6 +114,8 @@ func cortex_a17_errata_report
|
||||||
* Report all errata. The revision-variant information is passed to
|
* Report all errata. The revision-variant information is passed to
|
||||||
* checking functions of each errata.
|
* checking functions of each errata.
|
||||||
*/
|
*/
|
||||||
|
report_errata ERRATA_A17_852421, cortex_a17, 852421
|
||||||
|
report_errata ERRATA_A17_852423, cortex_a17, 852423
|
||||||
report_errata WORKAROUND_CVE_2017_5715, cortex_a17, cve_2017_5715
|
report_errata WORKAROUND_CVE_2017_5715, cortex_a17, cve_2017_5715
|
||||||
|
|
||||||
pop {r12, lr}
|
pop {r12, lr}
|
||||||
|
@ -66,12 +124,28 @@ endfunc cortex_a17_errata_report
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
func cortex_a17_reset_func
|
func cortex_a17_reset_func
|
||||||
|
mov r5, lr
|
||||||
|
bl cpu_get_rev_var
|
||||||
|
mov r4, r0
|
||||||
|
|
||||||
|
#if ERRATA_A17_852421
|
||||||
|
mov r0, r4
|
||||||
|
bl errata_a17_852421_wa
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ERRATA_A17_852423
|
||||||
|
mov r0, r4
|
||||||
|
bl errata_a17_852423_wa
|
||||||
|
#endif
|
||||||
|
|
||||||
#if IMAGE_BL32 && WORKAROUND_CVE_2017_5715
|
#if IMAGE_BL32 && WORKAROUND_CVE_2017_5715
|
||||||
ldr r0, =workaround_bpiall_runtime_exceptions
|
ldr r0, =workaround_bpiall_runtime_exceptions
|
||||||
stcopr r0, VBAR
|
stcopr r0, VBAR
|
||||||
stcopr r0, MVBAR
|
stcopr r0, MVBAR
|
||||||
/* isb will be applied in the course of the reset func */
|
/* isb will be applied in the course of the reset func */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
mov lr, r5
|
||||||
b cortex_a17_enable_smp
|
b cortex_a17_enable_smp
|
||||||
endfunc cortex_a17_reset_func
|
endfunc cortex_a17_reset_func
|
||||||
|
|
||||||
|
|
|
@ -61,6 +61,14 @@ ERRATA_A15_816470 ?=0
|
||||||
# only to revision >= r3p0 of the Cortex A15 cpu.
|
# only to revision >= r3p0 of the Cortex A15 cpu.
|
||||||
ERRATA_A15_827671 ?=0
|
ERRATA_A15_827671 ?=0
|
||||||
|
|
||||||
|
# Flag to apply erratum 852421 workaround during reset. This erratum applies
|
||||||
|
# only to revision <= r1p2 of the Cortex A17 cpu.
|
||||||
|
ERRATA_A17_852421 ?=0
|
||||||
|
|
||||||
|
# Flag to apply erratum 852423 workaround during reset. This erratum applies
|
||||||
|
# only to revision <= r1p2 of the Cortex A17 cpu.
|
||||||
|
ERRATA_A17_852423 ?=0
|
||||||
|
|
||||||
# Flag to apply erratum 819472 workaround during reset. This erratum applies
|
# Flag to apply erratum 819472 workaround during reset. This erratum applies
|
||||||
# only to revision <= r0p1 of the Cortex A53 cpu.
|
# only to revision <= r0p1 of the Cortex A53 cpu.
|
||||||
ERRATA_A53_819472 ?=0
|
ERRATA_A53_819472 ?=0
|
||||||
|
@ -212,6 +220,14 @@ $(eval $(call add_define,ERRATA_A15_816470))
|
||||||
$(eval $(call assert_boolean,ERRATA_A15_827671))
|
$(eval $(call assert_boolean,ERRATA_A15_827671))
|
||||||
$(eval $(call add_define,ERRATA_A15_827671))
|
$(eval $(call add_define,ERRATA_A15_827671))
|
||||||
|
|
||||||
|
# Process ERRATA_A17_852421 flag
|
||||||
|
$(eval $(call assert_boolean,ERRATA_A17_852421))
|
||||||
|
$(eval $(call add_define,ERRATA_A17_852421))
|
||||||
|
|
||||||
|
# Process ERRATA_A17_852423 flag
|
||||||
|
$(eval $(call assert_boolean,ERRATA_A17_852423))
|
||||||
|
$(eval $(call add_define,ERRATA_A17_852423))
|
||||||
|
|
||||||
# Process ERRATA_A53_819472 flag
|
# Process ERRATA_A53_819472 flag
|
||||||
$(eval $(call assert_boolean,ERRATA_A53_819472))
|
$(eval $(call assert_boolean,ERRATA_A53_819472))
|
||||||
$(eval $(call add_define,ERRATA_A53_819472))
|
$(eval $(call add_define,ERRATA_A53_819472))
|
||||||
|
|
Loading…
Reference in New Issue