system-arm: Initialize ICC_SRE_EL3 register of all CPUs
authorChun-Chen TK Hsu <chunchenhsu@google.com>
Tue, 8 Oct 2019 11:02:33 +0000 (19:02 +0800)
committerChun-Chen TK Hsu <chunchenhsu@google.com>
Wed, 9 Oct 2019 03:45:47 +0000 (03:45 +0000)
Fix a bug that only CPU0 initialized ICC_SRE_EL3 register.

Change-Id: I625c9a25bada80b864e5eb5a8b8be14ee324b801
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21539
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>

system/arm/aarch64_bootloader/boot.S

index 5e5e394394c6813a5177d567633a535f43d54171..38090c8f28d8ea81e5d97d4ca5fb72703f9c6996 100644 (file)
@@ -91,12 +91,12 @@ _start:
         str    w0, [x1], #4
 
         /* SRE & Disable IRQ/FIQ Bypass & Allow EL2 access to ICC_SRE_EL2 */
-        mrs    x10, S3_6_C12_C12_5 // read ICC_SRE_EL3
+2:      mrs    x10, S3_6_C12_C12_5 // read ICC_SRE_EL3
         orr    x10, x10, #0xf      // enable 0xf
         msr    S3_6_C12_C12_5, x10 // write ICC_SRE_EL3
         isb
 
-2:      mov    x0, #1
+        mov    x0, #1
         msr    S3_0_c12_c12_6, x0 // ICC_IGRPEN0_EL1 Enable
         msr    S3_0_C12_C12_7, x0 // ICC_IGRPEN1_EL1 Enable
 #else