Merge pull request #1882 from ambroise-arm/av/a15-errata
Apply workarounds for errata of Cortex-A15
This commit is contained in:
commit
b9d20d0eda
|
@ -71,6 +71,14 @@ for it to specify which errata workarounds should be enabled or not.
|
||||||
The value of the build flags is 0 by default, that is, disabled. A value of 1
|
The value of the build flags is 0 by default, that is, disabled. A value of 1
|
||||||
will enable it.
|
will enable it.
|
||||||
|
|
||||||
|
For Cortex-A15, the following errata build flags are defined :
|
||||||
|
|
||||||
|
- ``ERRATA_A15_816470``: This applies errata 816470 workaround to Cortex-A15
|
||||||
|
CPU. This needs to be enabled only for revision >= r3p0 of the CPU.
|
||||||
|
|
||||||
|
- ``ERRATA_A15_827671``: This applies errata 827671 workaround to Cortex-A15
|
||||||
|
CPU. This needs to be enabled only for revision >= r3p0 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
|
||||||
|
|
|
@ -9,6 +9,13 @@
|
||||||
|
|
||||||
#include <lib/utils_def.h>
|
#include <lib/utils_def.h>
|
||||||
|
|
||||||
|
/*******************************************************************************
|
||||||
|
* Auxiliary Control Register 2 specific definitions.
|
||||||
|
******************************************************************************/
|
||||||
|
#define CORTEX_A15_ACTLR2 p15, 1, c15, c0, 4
|
||||||
|
|
||||||
|
#define CORTEX_A15_ACTLR2_INV_DCC_BIT (U(1) << 0)
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Cortex-A15 midr with version/revision set to 0
|
* Cortex-A15 midr with version/revision set to 0
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -29,6 +29,13 @@ func cortex_a15_disable_smp
|
||||||
bic r0, #CORTEX_A15_ACTLR_SMP_BIT
|
bic r0, #CORTEX_A15_ACTLR_SMP_BIT
|
||||||
stcopr r0, ACTLR
|
stcopr r0, ACTLR
|
||||||
isb
|
isb
|
||||||
|
#if ERRATA_A15_816470
|
||||||
|
/*
|
||||||
|
* Invalidate any TLB address
|
||||||
|
*/
|
||||||
|
mov r0, #0
|
||||||
|
stcopr r0, TLBIMVA
|
||||||
|
#endif
|
||||||
dsb sy
|
dsb sy
|
||||||
bx lr
|
bx lr
|
||||||
endfunc cortex_a15_disable_smp
|
endfunc cortex_a15_disable_smp
|
||||||
|
@ -41,6 +48,49 @@ func cortex_a15_enable_smp
|
||||||
bx lr
|
bx lr
|
||||||
endfunc cortex_a15_enable_smp
|
endfunc cortex_a15_enable_smp
|
||||||
|
|
||||||
|
/* ----------------------------------------------------
|
||||||
|
* Errata Workaround for Cortex A15 Errata #816470.
|
||||||
|
* This applies only to revision >= r3p0 of Cortex A15.
|
||||||
|
* ----------------------------------------------------
|
||||||
|
*/
|
||||||
|
func check_errata_816470
|
||||||
|
/*
|
||||||
|
* Even though this is only needed for revision >= r3p0, it is always
|
||||||
|
* applied because of the low cost of the workaround.
|
||||||
|
*/
|
||||||
|
mov r0, #ERRATA_APPLIES
|
||||||
|
bx lr
|
||||||
|
endfunc check_errata_816470
|
||||||
|
|
||||||
|
/* ----------------------------------------------------
|
||||||
|
* Errata Workaround for Cortex A15 Errata #827671.
|
||||||
|
* This applies only to revision >= r3p0 of Cortex A15.
|
||||||
|
* Inputs:
|
||||||
|
* r0: variant[4:7] and revision[0:3] of current cpu.
|
||||||
|
* Shall clobber: r0-r3
|
||||||
|
* ----------------------------------------------------
|
||||||
|
*/
|
||||||
|
func errata_a15_827671_wa
|
||||||
|
/*
|
||||||
|
* Compare r0 against revision r3p0
|
||||||
|
*/
|
||||||
|
mov r2, lr
|
||||||
|
bl check_errata_827671
|
||||||
|
cmp r0, #ERRATA_NOT_APPLIES
|
||||||
|
beq 1f
|
||||||
|
ldcopr r0, CORTEX_A15_ACTLR2
|
||||||
|
orr r0, #CORTEX_A15_ACTLR2_INV_DCC_BIT
|
||||||
|
stcopr r0, CORTEX_A15_ACTLR2
|
||||||
|
isb
|
||||||
|
1:
|
||||||
|
bx r2
|
||||||
|
endfunc errata_a15_827671_wa
|
||||||
|
|
||||||
|
func check_errata_827671
|
||||||
|
mov r1, #0x30
|
||||||
|
b cpu_rev_var_hs
|
||||||
|
endfunc check_errata_827671
|
||||||
|
|
||||||
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
|
||||||
|
@ -64,6 +114,8 @@ func cortex_a15_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_A15_816470, cortex_a15, 816470
|
||||||
|
report_errata ERRATA_A15_827671, cortex_a15, 827671
|
||||||
report_errata WORKAROUND_CVE_2017_5715, cortex_a15, cve_2017_5715
|
report_errata WORKAROUND_CVE_2017_5715, cortex_a15, cve_2017_5715
|
||||||
|
|
||||||
pop {r12, lr}
|
pop {r12, lr}
|
||||||
|
@ -72,6 +124,13 @@ endfunc cortex_a15_errata_report
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
func cortex_a15_reset_func
|
func cortex_a15_reset_func
|
||||||
|
mov r5, lr
|
||||||
|
bl cpu_get_rev_var
|
||||||
|
|
||||||
|
#if ERRATA_A15_827671
|
||||||
|
bl errata_a15_827671_wa
|
||||||
|
#endif
|
||||||
|
|
||||||
#if IMAGE_BL32 && WORKAROUND_CVE_2017_5715
|
#if IMAGE_BL32 && WORKAROUND_CVE_2017_5715
|
||||||
ldcopr r0, ACTLR
|
ldcopr r0, ACTLR
|
||||||
orr r0, #CORTEX_A15_ACTLR_INV_BTB_BIT
|
orr r0, #CORTEX_A15_ACTLR_INV_BTB_BIT
|
||||||
|
@ -81,6 +140,8 @@ func cortex_a15_reset_func
|
||||||
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_a15_enable_smp
|
b cortex_a15_enable_smp
|
||||||
endfunc cortex_a15_reset_func
|
endfunc cortex_a15_reset_func
|
||||||
|
|
||||||
|
|
|
@ -53,6 +53,14 @@ endif
|
||||||
# These should be enabled by the platform if the erratum workaround needs to be
|
# These should be enabled by the platform if the erratum workaround needs to be
|
||||||
# applied.
|
# applied.
|
||||||
|
|
||||||
|
# Flag to apply erratum 816470 workaround during power down. This erratum
|
||||||
|
# applies only to revision >= r3p0 of the Cortex A15 cpu.
|
||||||
|
ERRATA_A15_816470 ?=0
|
||||||
|
|
||||||
|
# Flag to apply erratum 827671 workaround during reset. This erratum applies
|
||||||
|
# only to revision >= r3p0 of the Cortex A15 cpu.
|
||||||
|
ERRATA_A15_827671 ?=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
|
||||||
|
@ -196,6 +204,14 @@ ERRATA_N1_1043202 ?=1
|
||||||
# higher DSU power consumption on idle.
|
# higher DSU power consumption on idle.
|
||||||
ERRATA_DSU_936184 ?=0
|
ERRATA_DSU_936184 ?=0
|
||||||
|
|
||||||
|
# Process ERRATA_A15_816470 flag
|
||||||
|
$(eval $(call assert_boolean,ERRATA_A15_816470))
|
||||||
|
$(eval $(call add_define,ERRATA_A15_816470))
|
||||||
|
|
||||||
|
# Process ERRATA_A15_827671 flag
|
||||||
|
$(eval $(call assert_boolean,ERRATA_A15_827671))
|
||||||
|
$(eval $(call add_define,ERRATA_A15_827671))
|
||||||
|
|
||||||
# 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