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

Merge "fix(cpus): fix cpu version check for Neoverse N2, V1" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2022-10-20 15:56:57 +02:00 • committed by TrustedFirmware Code Review
commit 9287a3fa75
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/cpus/aarch64/neoverse_n2.S
View file

@ -429,6 +429,10 @@ func neoverse_n2_reset_func
orr x0, x0, #NEOVERSE_N2_CPUACTLR2_EL1_BIT_2
msr NEOVERSE_N2_CPUACTLR2_EL1, x0
/* Get the CPU revision and stash it in x18. */
bl cpu_get_rev_var
mov x18, x0
#if ERRATA_DSU_2313941
bl errata_dsu_2313941_wa
#endif
@ -510,9 +514,6 @@ func neoverse_n2_reset_func
msr NEOVERSE_N2_CPUECTLR_EL1, x0
#endif
bl cpu_get_rev_var
mov x18, x0
#if ERRATA_N2_2002655
mov x0, x18
bl errata_n2_2002655_wa

6
lib/cpus/aarch64/neoverse_v1.S
View file

@ -508,8 +508,8 @@ func neoverse_v1_errata_report
report_errata ERRATA_V1_1925756, neoverse_v1, 1925756
report_errata ERRATA_V1_1940577, neoverse_v1, 1940577
report_errata ERRATA_V1_1966096, neoverse_v1, 1966096
report_errata ERRATA_V1_2139242, neoverse_v1, 2139242
report_errata ERRATA_V1_2108267, neoverse_v1, 2108267
report_errata ERRATA_V1_2139242, neoverse_v1, 2139242
report_errata ERRATA_V1_2216392, neoverse_v1, 2216392
report_errata ERRATA_V1_2294912, neoverse_v1, 2294912
report_errata ERRATA_V1_2372203, neoverse_v1, 2372203
@ -527,6 +527,10 @@ func neoverse_v1_reset_func
msr SSBS, xzr
isb
/* Get the CPU revision and stash it in x18. */
bl cpu_get_rev_var
mov x18, x0
#if ERRATA_V1_1618635
mov x0, x18
bl errata_neoverse_v1_1618635_wa