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

Add support for Cortex-A57 erratum 828024 workaround

Browse source 
Change-Id: I632a8c5bb517ff89c69268e865be33101059be7d
This commit is contained in:
Sandrine Bailleux 2016-04-14 14:04:48 +01:00
parent df22d602b6
commit a8b1c76936
4 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/cpu-specific-build-macros.md
View file

@ -63,6 +63,9 @@ For Cortex-A57, following errata build flags are defined :
* `ERRATA_A57_826974`: This applies errata 826974 workaround to Cortex-A57 * `ERRATA_A57_826974`: This applies errata 826974 workaround to Cortex-A57
CPU. This needs to be enabled only for revision <= r1p1 of the CPU. CPU. This needs to be enabled only for revision <= r1p1 of the CPU.
* `ERRATA_A57_828024`: This applies errata 828024 workaround to Cortex-A57
CPU. This needs to be enabled only for revision <= r1p1 of the CPU.
3. CPU Specific optimizations 3. CPU Specific optimizations
------------------------------ ------------------------------

2
include/lib/cpus/aarch64/cortex_a57.h
View file

@ -65,6 +65,8 @@
#define CPUACTLR_DIS_OVERREAD (1 << 52) #define CPUACTLR_DIS_OVERREAD (1 << 52)
#define CPUACTLR_NO_ALLOC_WBWA (1 << 49) #define CPUACTLR_NO_ALLOC_WBWA (1 << 49)
#define CPUACTLR_DCC_AS_DCCI (1 << 44) #define CPUACTLR_DCC_AS_DCCI (1 << 44)
#define CPUACTLR_DIS_STREAMING (3 << 27)
#define CPUACTLR_DIS_L1_STREAMING (3 << 25)
/******************************************************************************* /*******************************************************************************
* L2 Control register specific definitions. * L2 Control register specific definitions.

35
lib/cpus/aarch64/cortex_a57.S
View file

@ -193,6 +193,37 @@ apply_826974:
ret ret
endfunc errata_a57_826974_wa endfunc errata_a57_826974_wa
/* ---------------------------------------------------
* Errata Workaround for Cortex A57 Errata #828024.
* This applies only to revision <= r1p1 of Cortex A57.
* Inputs:
* x0: variant[4:7] and revision[0:3] of current cpu.
* Clobbers : x0 - x5
* ---------------------------------------------------
*/
func errata_a57_828024_wa
/*
* Compare x0 against revision r1p1
*/
cmp x0, #0x11
b.ls apply_828024
#if LOG_LEVEL >= LOG_LEVEL_VERBOSE
b print_revision_warning
#else
ret
#endif
apply_828024:
mrs x1, CPUACTLR_EL1
/*
* Setting the relevant bits in CPUACTLR_EL1 has to be done in 2
* instructions here because the resulting bitmask doesn't fit in a
* 16-bit value so it cannot be encoded in a single instruction.
*/
orr x1, x1, #CPUACTLR_NO_ALLOC_WBWA
orr x1, x1, #(CPUACTLR_DIS_L1_STREAMING | CPUACTLR_DIS_STREAMING)
msr CPUACTLR_EL1, x1
ret
endfunc errata_a57_828024_wa
/* ------------------------------------------------- /* -------------------------------------------------
* The CPU Ops reset function for Cortex-A57. * The CPU Ops reset function for Cortex-A57.
@ -232,6 +263,10 @@ func cortex_a57_reset_func
bl errata_a57_826974_wa bl errata_a57_826974_wa
#endif #endif
#if ERRATA_A57_828024
mov x0, x15
bl errata_a57_828024_wa
#endif
/* --------------------------------------------- /* ---------------------------------------------
* Enable the SMP bit. * Enable the SMP bit.
* --------------------------------------------- * ---------------------------------------------

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

@ -78,6 +78,10 @@ ERRATA_A57_813420 ?=0
# only to revision <= r1p1 of the Cortex A57 cpu. # only to revision <= r1p1 of the Cortex A57 cpu.
ERRATA_A57_826974 ?=0 ERRATA_A57_826974 ?=0
# Flag to apply erratum 828024 workaround during reset. This erratum applies
# only to revision <= r1p1 of the Cortex A57 cpu.
ERRATA_A57_828024 ?=0
# Process ERRATA_A53_826319 flag # Process ERRATA_A53_826319 flag
$(eval $(call assert_boolean,ERRATA_A53_826319)) $(eval $(call assert_boolean,ERRATA_A53_826319))
$(eval $(call add_define,ERRATA_A53_826319)) $(eval $(call add_define,ERRATA_A53_826319))
@ -97,3 +101,7 @@ $(eval $(call add_define,ERRATA_A57_813420))
# Process ERRATA_A57_826974 flag # Process ERRATA_A57_826974 flag
$(eval $(call assert_boolean,ERRATA_A57_826974)) $(eval $(call assert_boolean,ERRATA_A57_826974))
$(eval $(call add_define,ERRATA_A57_826974)) $(eval $(call add_define,ERRATA_A57_826974))
# Process ERRATA_A57_828024 flag
$(eval $(call assert_boolean,ERRATA_A57_828024))
$(eval $(call add_define,ERRATA_A57_828024))