Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(arm): fix GIC macros for GICv4.1 support" into integration

Browse source
This commit is contained in:
Manish Pandey 2023-10-26 12:00:33 +02:00 • committed by TrustedFirmware Code Review
commit 41095bd3f9
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/plat/arm/common/aarch64/arm_macros.S
View file

@ -39,11 +39,17 @@ prefix:
* --------------------------------------------- * ---------------------------------------------
*/ */
.macro arm_print_gic_regs .macro arm_print_gic_regs
/* Check for GICv3 system register access */ /* Check for GICv3/v4 system register access.
* ID_AA64PFR0_GIC indicates presence of the CPU
* system registers by either 0b0011 or 0xb0001.
* A value of 0b000 means CPU system registers aren't
* available and the code needs to use the memory
* mapped registers like in GICv2.
*/
mrs x7, id_aa64pfr0_el1 mrs x7, id_aa64pfr0_el1
ubfx x7, x7, #ID_AA64PFR0_GIC_SHIFT, #ID_AA64PFR0_GIC_WIDTH ubfx x7, x7, #ID_AA64PFR0_GIC_SHIFT, #ID_AA64PFR0_GIC_WIDTH
cmp x7, #1 cmp x7, #0
b.ne print_gicv2 b.eq print_gicv2
/* Check for SRE enable */ /* Check for SRE enable */
mrs x8, ICC_SRE_EL3 mrs x8, ICC_SRE_EL3