diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-04-14 14:24:13 +0100 |
|---|---|---|
| committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2016-04-21 12:59:59 +0100 |
| commit | 072888656dc331c6b4bded88738e7b34166c0933 (patch) | |
| tree | 47243bfb790b50a76aa36b55949bdc8c1c631764 /lib | |
| parent | 0b77197baf9a22625f91112cf009c9209f4279e8 (diff) | |
Add support for Cortex-A57 erratum 826977 workaround
Change-Id: Icaacd19c4cef9c10d02adcc2f84a4d7c97d4bcfa
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpus/aarch64/cortex_a57.S | 31 | ||||
| -rw-r--r-- | lib/cpus/cpu-ops.mk | 8 |
2 files changed, 39 insertions, 0 deletions
diff --git a/lib/cpus/aarch64/cortex_a57.S b/lib/cpus/aarch64/cortex_a57.S index 25def1cd..63cb7579 100644 --- a/lib/cpus/aarch64/cortex_a57.S +++ b/lib/cpus/aarch64/cortex_a57.S @@ -194,6 +194,32 @@ apply_826974: endfunc errata_a57_826974_wa /* --------------------------------------------------- + * Errata Workaround for Cortex A57 Errata #826977. + * 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_826977_wa + /* + * Compare x0 against revision r1p1 + */ + cmp x0, #0x11 + b.ls apply_826977 +#if LOG_LEVEL >= LOG_LEVEL_VERBOSE + b print_revision_warning +#else + ret +#endif +apply_826977: + mrs x1, CPUACTLR_EL1 + orr x1, x1, #CPUACTLR_GRE_NGRE_AS_NGNRE + msr CPUACTLR_EL1, x1 + ret +endfunc errata_a57_826977_wa + + /* --------------------------------------------------- * Errata Workaround for Cortex A57 Errata #828024. * This applies only to revision <= r1p1 of Cortex A57. * Inputs: @@ -289,6 +315,11 @@ func cortex_a57_reset_func bl errata_a57_826974_wa #endif +#if ERRATA_A57_826977 + mov x0, x15 + bl errata_a57_826977_wa +#endif + #if ERRATA_A57_828024 mov x0, x15 bl errata_a57_828024_wa diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index 62de70f5..aa808b61 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -78,6 +78,10 @@ ERRATA_A57_813420 ?=0 # only to revision <= r1p1 of the Cortex A57 cpu. ERRATA_A57_826974 ?=0 +# Flag to apply erratum 826977 workaround during reset. This erratum applies +# only to revision <= r1p1 of the Cortex A57 cpu. +ERRATA_A57_826977 ?=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 @@ -106,6 +110,10 @@ $(eval $(call add_define,ERRATA_A57_813420)) $(eval $(call assert_boolean,ERRATA_A57_826974)) $(eval $(call add_define,ERRATA_A57_826974)) +# Process ERRATA_A57_826977 flag +$(eval $(call assert_boolean,ERRATA_A57_826977)) +$(eval $(call add_define,ERRATA_A57_826977)) + # Process ERRATA_A57_828024 flag $(eval $(call assert_boolean,ERRATA_A57_828024)) $(eval $(call add_define,ERRATA_A57_828024)) |