So, this doesn't have anything to do with this review, but seeing it reminded me of something I've been wondering for a while.
Why does ARM use a "bootloader" to set up some of this init time stuff and not the System or Platform object? Is it just more or less an aesthetic choice, or is there a technical reason it needs to be done that way? Just wondering, please let me know if you have a chance. Gabe On Mon, Jan 7, 2019 at 2:29 PM Jairo Balart (Gerrit) < noreply-gerritcodereview-l2avaq5ar7ye7im4vtz...@google.com> wrote: > Jairo Balart has submitted this change and it was merged. ( > https://gem5-review.googlesource.com/c/public/gem5/+/13435 ) > > Change subject: system-arm: Add aarch64 bootloader support for GICv3 > ...................................................................... > > system-arm: Add aarch64 bootloader support for GICv3 > > Change-Id: If75262709868cc59d320f60273a32397339f1dd5 > Signed-off-by: Jairo Balart <jairo.bal...@metempsy.com> > Reviewed-on: https://gem5-review.googlesource.com/c/13435 > Reviewed-by: Andreas Sandberg <andreas.sandb...@arm.com> > Maintainer: Andreas Sandberg <andreas.sandb...@arm.com> > --- > M .gitignore > M system/arm/aarch64_bootloader/boot.S > M system/arm/aarch64_bootloader/makefile > 3 files changed, 34 insertions(+), 1 deletion(-) > > Approvals: > Andreas Sandberg: Looks good to me, approved; Looks good to me, approved > > > > diff --git a/.gitignore b/.gitignore > index 6075ffe..9a276b2 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -24,3 +24,4 @@ > /system/arm/simple_bootloader/boot.arm > /system/arm/simple_bootloader/boot_emm.arm > /system/arm/aarch64_bootloader/boot_emm.arm64 > +/system/arm/aarch64_bootloader/boot_emm_v2.arm64 > diff --git a/system/arm/aarch64_bootloader/boot.S > b/system/arm/aarch64_bootloader/boot.S > index 71c6830..589f38a 100644 > --- a/system/arm/aarch64_bootloader/boot.S > +++ b/system/arm/aarch64_bootloader/boot.S > @@ -67,6 +67,34 @@ > // Test the the MPIDR_EL1 register against 0xff00ffffff to > // extract the primary CPU. > ldr x1, =0xff00ffffff > +#ifdef GICV3 > + and x2, x0, #0xff // use Aff0 as cpuid for now... > + tst x0, x1 // check for cpuid==zero > + b.ne 1f // secondary CPU > + > + ldr x1, =GIC_DIST_BASE // GICD_CTLR > + mov w0, #7 // EnableGrp0 | EnableGrp1NS | EnableGrp1S > + str w0, [x1] > + > + > +1: ldr x1, =GIC_REDIST_BASE + 0x10000 + 0x80 // GICR_IGROUPR0 > + // 128K for each redistributor, 256K strided... > + mov x3, #1 << 18 // GICv4 > + mul x3, x3, x2 > + add x1, x1, x3 > + mov w0, #~0 // Grp1 interrupts > + str w0, [x1], #4 > + b.ne 2f // Only local interrupts for secondary CPUs > + ldr x1, =GIC_DIST_BASE + 0x84 // GICD_IGROUPR > + str w0, [x1], #4 > + str w0, [x1], #4 > + str w0, [x1], #4 > + > + > +2: 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 > tst x0, x1 // check for cpuid==zero > b.ne 1f // secondary CPU > > @@ -88,6 +116,7 @@ > > mov w0, #1 << 7 // allow NS access to > GICC_PMR > str w0, [x1, #4] // GICC_PMR > +#endif > > msr sctlr_el2, xzr > > diff --git a/system/arm/aarch64_bootloader/makefile > b/system/arm/aarch64_bootloader/makefile > index 4428d26..9ffff76 100644 > --- a/system/arm/aarch64_bootloader/makefile > +++ b/system/arm/aarch64_bootloader/makefile > @@ -1,4 +1,7 @@ > build: > aarch64-linux-gnu-gcc -c -DPHYS_OFFSET=0x80000000 > -DCNTFRQ=0x01800000 > -DUART_BASE=0x1c090000 -DSYSREGS_BASE=0x1c010000 > -DGIC_DIST_BASE=0x2c001000 > -DGIC_CPU_BASE=0x2c002000 -Dkernel=0x80080000 -Dmbox=0x8000fff8 > -Ddtb=0x80000100 -o boot_emm.o -march=armv8-a boot.S > aarch64-linux-gnu-ld -o boot_emm.arm64 -N -Ttext 0x00000010 > boot_emm.o > -non_shared -static > - rm boot_emm.o > \ No newline at end of file > + rm boot_emm.o > + aarch64-linux-gnu-gcc -c -DGICV3 -DPHYS_OFFSET=0x80000000 > -DCNTFRQ=0x01800000 -DUART_BASE=0x1c090000 -DSYSREGS_BASE=0x1c010000 > -DGIC_DIST_BASE=0x2c000000 -DGIC_REDIST_BASE=0x2c010000 > -Dkernel=0x80080000 > -Dmbox=0x8000fff8 -Ddtb=0x80000100 -o boot_emm_v2.o -march=armv8-a boot.S > + aarch64-linux-gnu-ld -o boot_emm_v2.arm64 -N -Ttext 0x00000010 > boot_emm_v2.o -non_shared -static > + rm boot_emm_v2.o > > -- > To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13435 > To unsubscribe, or for help writing mail filters, visit > https://gem5-review.googlesource.com/settings > > Gerrit-Project: public/gem5 > Gerrit-Branch: master > Gerrit-Change-Id: If75262709868cc59d320f60273a32397339f1dd5 > Gerrit-Change-Number: 13435 > Gerrit-PatchSet: 3 > Gerrit-Owner: Jairo Balart <jairo.bal...@metempsy.com> > Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com> > Gerrit-Reviewer: Jairo Balart <jairo.bal...@metempsy.com> > Gerrit-CC: Giacomo Travaglini <giacomo.travagl...@arm.com> > Gerrit-MessageType: merged > _______________________________________________ > gem5-dev mailing list > gem5-dev@gem5.org > http://m5sim.org/mailman/listinfo/gem5-dev _______________________________________________ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
