armstub8: Initialize ACTLR here too (closes #114)

raspberrypi · Oct 8, 2020 · fc0e73c · fc0e73c
1 parent 14985bb
commit fc0e73c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/armstubs/armstub8.S b/armstubs/armstub8.S
@@ -65,6 +65,9 @@
 #define SCR_VAL \
     (SCR_RW | SCR_HCE | SCR_SMD | SCR_RES1_5 | SCR_RES1_4 | SCR_NS)
 
+#define ACTLR_VAL \
+	(BIT(0) | BIT(1) | BIT(4) | BIT(5) | BIT(6))
+
 #define CPUECTLR_EL1		S3_1_C15_C2_1
 #define CPUECTLR_EL1_SMPEN	BIT(6)
 
@@ -120,6 +123,10 @@ _start:
 	mov x0, #SCR_VAL
 	msr SCR_EL3, x0
 
+	/* Set up ACTLR */
+	mov x0, #ACTLR_VAL
+	msr ACTLR_EL3, x0
+
 	/* Set SMPEN */
 	mov x0, #CPUECTLR_EL1_SMPEN
 	msr CPUECTLR_EL1, x0