diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-05-03 13:17:56 +0100 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2019-05-07 13:46:47 +0100 |
| commit | f85edcea5ff651a47fc1434d2d9b5475cc56aa29 (patch) | |
| tree | a154ae02c453f133ceceb9f6b7e4aae422cd19e9 /include/arch | |
| parent | e6e1d0ac162027334471e1eb9f1e0ce46065db6a (diff) | |
Workaround for cortex-A76 errata 1286807
The workaround for Cortex-A76 errata #1286807 is implemented
in this patch.
Change-Id: I6c15af962ac99ce223e009f6d299cefb41043bed
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Diffstat (limited to 'include/arch')
| -rw-r--r-- | include/arch/aarch64/arch_helpers.h | 50 | ||||
| -rw-r--r-- | include/arch/aarch64/asm_macros.S | 4 |
2 files changed, 40 insertions, 14 deletions
diff --git a/include/arch/aarch64/arch_helpers.h b/include/arch/aarch64/arch_helpers.h index c3ce1c4d..c1737064 100644 --- a/include/arch/aarch64/arch_helpers.h +++ b/include/arch/aarch64/arch_helpers.h @@ -87,12 +87,13 @@ static inline void _op ## _type(uint64_t v) \ * TLB maintenance accessor prototypes ******************************************************************************/ -#if ERRATA_A57_813419 +#if ERRATA_A57_813419 || ERRATA_A76_1286807 /* * Define function for TLBI instruction with type specifier that implements - * the workaround for errata 813419 of Cortex-A57. + * the workaround for errata 813419 of Cortex-A57 or errata 1286807 of + * Cortex-A76. */ -#define DEFINE_TLBIOP_ERRATA_A57_813419_TYPE_FUNC(_type)\ +#define DEFINE_TLBIOP_ERRATA_TYPE_FUNC(_type)\ static inline void tlbi ## _type(void) \ { \ __asm__("tlbi " #_type "\n" \ @@ -102,9 +103,10 @@ static inline void tlbi ## _type(void) \ /* * Define function for TLBI instruction with register parameter that implements - * the workaround for errata 813419 of Cortex-A57. + * the workaround for errata 813419 of Cortex-A57 or errata 1286807 of + * Cortex-A76. */ -#define DEFINE_TLBIOP_ERRATA_A57_813419_TYPE_PARAM_FUNC(_type) \ +#define DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(_type) \ static inline void tlbi ## _type(uint64_t v) \ { \ __asm__("tlbi " #_type ", %0\n" \ @@ -125,27 +127,51 @@ static inline void dc ## _name(uint64_t v) \ } #endif /* ERRATA_A53_819472 || ERRATA_A53_824069 || ERRATA_A53_827319 */ +#if ERRATA_A57_813419 DEFINE_SYSOP_TYPE_FUNC(tlbi, alle1) DEFINE_SYSOP_TYPE_FUNC(tlbi, alle1is) DEFINE_SYSOP_TYPE_FUNC(tlbi, alle2) DEFINE_SYSOP_TYPE_FUNC(tlbi, alle2is) -#if ERRATA_A57_813419 -DEFINE_TLBIOP_ERRATA_A57_813419_TYPE_FUNC(alle3) -DEFINE_TLBIOP_ERRATA_A57_813419_TYPE_FUNC(alle3is) +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(alle3) +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(alle3is) +DEFINE_SYSOP_TYPE_FUNC(tlbi, vmalle1) +#elif ERRATA_A76_1286807 +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(alle1) +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(alle1is) +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(alle2) +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(alle2is) +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(alle3) +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(alle3is) +DEFINE_TLBIOP_ERRATA_TYPE_FUNC(vmalle1) #else +DEFINE_SYSOP_TYPE_FUNC(tlbi, alle1) +DEFINE_SYSOP_TYPE_FUNC(tlbi, alle1is) +DEFINE_SYSOP_TYPE_FUNC(tlbi, alle2) +DEFINE_SYSOP_TYPE_FUNC(tlbi, alle2is) DEFINE_SYSOP_TYPE_FUNC(tlbi, alle3) DEFINE_SYSOP_TYPE_FUNC(tlbi, alle3is) -#endif DEFINE_SYSOP_TYPE_FUNC(tlbi, vmalle1) +#endif +#if ERRATA_A57_813419 DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vaae1is) DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vaale1is) DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vae2is) DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vale2is) -#if ERRATA_A57_813419 -DEFINE_TLBIOP_ERRATA_A57_813419_TYPE_PARAM_FUNC(vae3is) -DEFINE_TLBIOP_ERRATA_A57_813419_TYPE_PARAM_FUNC(vale3is) +DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(vae3is) +DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(vale3is) +#elif ERRATA_A76_1286807 +DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(vaae1is) +DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(vaale1is) +DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(vae2is) +DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(vale2is) +DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(vae3is) +DEFINE_TLBIOP_ERRATA_TYPE_PARAM_FUNC(vale3is) #else +DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vaae1is) +DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vaale1is) +DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vae2is) +DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vale2is) DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vae3is) DEFINE_SYSOP_TYPE_PARAM_FUNC(tlbi, vale3is) #endif diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S index 387be4ca..9b121855 100644 --- a/include/arch/aarch64/asm_macros.S +++ b/include/arch/aarch64/asm_macros.S @@ -12,9 +12,9 @@ /* * TLBI instruction with type specifier that implements the workaround for - * errata 813419 of Cortex-A57. + * errata 813419 of Cortex-A57 or errata 1286807 of Cortex-A76. */ -#if ERRATA_A57_813419 +#if ERRATA_A57_813419 || ERRATA_A76_1286807 #define TLB_INVALIDATE(_type) \ tlbi _type; \ dsb ish; \ |