system-arm: Awake GICv3 reditributors in the bootloader
Part of the booting procedure should be to wake up every redistributor
in the system by setting GICR_WAKER.Processor sleep to 0
Change-Id: I27150a812639de48c4ae0a4decabb4e414fa3a09
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/59395
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
diff --git a/system/arm/bootloader/arm64/boot.S b/system/arm/bootloader/arm64/boot.S
index 2499afe..3809f72 100644
--- a/system/arm/bootloader/arm64/boot.S
+++ b/system/arm/bootloader/arm64/boot.S
@@ -75,7 +75,7 @@
ldr x1, =0xff00ffffff
#ifdef GICV3
tst x0, x1 // check for cpuid==zero
- b.ne 2f // secondary CPU
+ b.ne 3f // secondary CPU
ldr x1, =GIC_DIST_BASE // GICD_CTLR
mov w0, #7 // EnableGrp0 | EnableGrp1NS | EnableGrp1S
@@ -90,7 +90,15 @@
ldr x1, =GIC_REDIST_BASE
mov w0, #~0 // Grp1 interrupts
-1: add x5, x1, #0x10000 // SGI base
+1: ldr w3, [x1, #0x14] // GICR_WAKER
+ and w3, w3, #~0x2 // Setting GICR_WAKER.ProcessorSleep to 0
+ str w3, [x1, #0x14]
+ dsb sy
+2: ldr w3, [x1, #0x14] // Re-reading GICR_WAKER
+ ands w3, w3, #0x4 // Checking GICR_WAKER.ChildrenAsleep
+ b.ne 2b // Keep reading GICR_WAKER.ChildrenAsleep until awake
+
+ add x5, x1, #0x10000 // SGI base
str w0, [x5, #0x80] // GICR_IGROUPR0
ldr w4, [x1, #0x8] // GICR_TYPER
add x1, x1, x2 // Point to next redistributor
@@ -105,7 +113,7 @@
str w0, [x1], #4
/* SRE & Disable IRQ/FIQ Bypass & Allow EL2 access to ICC_SRE_EL2 */
-2: mrs x10, S3_6_C12_C12_5 // read ICC_SRE_EL3
+3: 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
