|
@@ -252,12 +252,15 @@ skip_errata_801819:
|
|
|
pop {r1-r5} @ Restore the cpu info - fall through
|
|
|
#endif
|
|
|
|
|
|
-#ifdef CONFIG_ARM_ERRATA_430973
|
|
|
+#if defined(CONFIG_ARM_ERRATA_430973) || defined (CONFIG_ARM_CORTEX_A8_CVE_2017_5715)
|
|
|
mrc p15, 0, r0, c1, c0, 1 @ Read ACR
|
|
|
|
|
|
+#ifdef CONFIG_ARM_CORTEX_A8_CVE_2017_5715
|
|
|
+ orr r0, r0, #(0x1 << 6) @ Set IBE bit always to enable OS WA
|
|
|
+#else
|
|
|
cmp r2, #0x21 @ Only on < r2p1
|
|
|
orrlt r0, r0, #(0x1 << 6) @ Set IBE bit
|
|
|
-
|
|
|
+#endif
|
|
|
push {r1-r5} @ Save the cpu info registers
|
|
|
bl v7_arch_cp15_set_acr
|
|
|
pop {r1-r5} @ Restore the cpu info - fall through
|