Merge "fix(cpus): fix incorrect AMU trap settings for N2 CPU" into integration

This commit is contained in:
Manish Pandey 2023-12-18 18:51:10 +01:00 committed by TrustedFirmware Code Review
commit 23c5c69f77

View file

@ -252,9 +252,9 @@ cpu_reset_func_start neoverse_n2
#if ENABLE_FEAT_AMU
/* Make sure accesses from EL0/EL1 and EL2 are not trapped to EL3 */
sysreg_bit_set cptr_el3, TAM_BIT
sysreg_bit_clear cptr_el3, TAM_BIT
/* Make sure accesses from EL0/EL1 are not trapped to EL2 */
sysreg_bit_set cptr_el2, TAM_BIT
sysreg_bit_clear cptr_el2, TAM_BIT
/* No need to enable the counters as this would be done at el3 exit */
#endif