diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aarch32/misc_helpers.S | 6 | ||||
| -rw-r--r-- | lib/cpus/aarch32/cortex_a9.S | 10 | ||||
| -rw-r--r-- | lib/cpus/cpu-ops.mk | 7 |
3 files changed, 22 insertions, 1 deletions
diff --git a/lib/aarch32/misc_helpers.S b/lib/aarch32/misc_helpers.S index 77cf6cd90..6d2ec1c52 100644 --- a/lib/aarch32/misc_helpers.S +++ b/lib/aarch32/misc_helpers.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -171,6 +171,10 @@ endfunc memcpy4 func disable_mmu_secure mov r1, #(SCTLR_M_BIT | SCTLR_C_BIT) do_disable_mmu: +#if ERRATA_A9_794073 + stcopr r0, BPIALL + dsb +#endif ldcopr r0, SCTLR bic r0, r0, r1 stcopr r0, SCTLR diff --git a/lib/cpus/aarch32/cortex_a9.S b/lib/cpus/aarch32/cortex_a9.S index 1fb10b205..720034310 100644 --- a/lib/cpus/aarch32/cortex_a9.S +++ b/lib/cpus/aarch32/cortex_a9.S @@ -35,6 +35,15 @@ func cortex_a9_enable_smp bx lr endfunc cortex_a9_enable_smp +func check_errata_a9_794073 +#if ERRATA_A9_794073 + mov r0, #ERRATA_APPLIES +#else + mov r0, #ERRATA_MISSING +#endif + bx lr +endfunc check_errata_cve_2017_5715 + func check_errata_cve_2017_5715 #if WORKAROUND_CVE_2017_5715 mov r0, #ERRATA_APPLIES @@ -59,6 +68,7 @@ func cortex_a9_errata_report * checking functions of each errata. */ report_errata WORKAROUND_CVE_2017_5715, cortex_a9, cve_2017_5715 + report_errata ERRATA_A9_794073, cortex_a9, a9_79407 pop {r12, lr} bx lr diff --git a/lib/cpus/cpu-ops.mk b/lib/cpus/cpu-ops.mk index c42eb1cde..c7e8b33a3 100644 --- a/lib/cpus/cpu-ops.mk +++ b/lib/cpus/cpu-ops.mk @@ -53,6 +53,9 @@ endif # These should be enabled by the platform if the erratum workaround needs to be # applied. +# Flag to apply erratum 794073 workaround when disabling mmu. +ERRATA_A9_794073 ?=0 + # 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 @@ -212,6 +215,10 @@ ERRATA_N1_1043202 ?=1 # higher DSU power consumption on idle. ERRATA_DSU_936184 ?=0 +# Process ERRATA_A9_794073 flag +$(eval $(call assert_boolean,ERRATA_A9_794073)) +$(eval $(call add_define,ERRATA_A9_794073)) + # Process ERRATA_A15_816470 flag $(eval $(call assert_boolean,ERRATA_A15_816470)) $(eval $(call add_define,ERRATA_A15_816470)) |