summaryrefslogtreecommitdiff
path: root/include/common/el3_common_macros.S
diff options
context:
space:
mode:
Diffstat (limited to 'include/common/el3_common_macros.S')
-rw-r--r--include/common/el3_common_macros.S7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/common/el3_common_macros.S b/include/common/el3_common_macros.S
index ba80d95d..9b22a734 100644
--- a/include/common/el3_common_macros.S
+++ b/include/common/el3_common_macros.S
@@ -70,11 +70,12 @@
isb
/* ---------------------------------------------------------------------
- * Early set RES1 bits in SCR_EL3. Set EA bit as well to catch both
- * External Aborts and SError Interrupts in EL3.
+ * Early set RES1 bits in SCR_EL3. Set EA bit to catch both
+ * External Aborts and SError Interrupts in EL3 and also the SIF bit
+ * to disable instruction fetches from Non-secure memory.
* ---------------------------------------------------------------------
*/
- mov x0, #(SCR_RES1_BITS | SCR_EA_BIT)
+ mov x0, #(SCR_RES1_BITS | SCR_EA_BIT | SCR_SIF_BIT)
msr scr_el3, x0
/* ---------------------------------------------------------------------
* Enable External Aborts and SError Interrupts now that the exception