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

Merge "fix(errata): check for SCU before accessing DSU" into integration

Browse source
This commit is contained in:
Manish Pandey 2023-11-24 15:33:04 +01:00 • committed by TrustedFirmware Code Review
commit 96bdb49d7c
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/cpus/aarch64/dsu_helpers.S
View file

@ -151,13 +151,22 @@ endfunc errata_dsu_936184_wa
* This function is called from both assembly and C environment. So it * This function is called from both assembly and C environment. So it
* follows AAPCS. * follows AAPCS.
* *
* Clobbers: x0-x3 * Clobbers: x0-x4
* ----------------------------------------------------------------------- * -----------------------------------------------------------------------
*/ */
.globl check_errata_dsu_2313941 .globl check_errata_dsu_2313941
.globl errata_dsu_2313941_wa .globl errata_dsu_2313941_wa
func check_errata_dsu_2313941 func check_errata_dsu_2313941
mov x4, x30
bl is_scu_present_in_dsu
cmp x0, xzr
/* Default error status */
mov x0, #ERRATA_NOT_APPLIES
/* If SCU is not present, return without applying patch */
b.eq 1f
mov x2, #ERRATA_APPLIES mov x2, #ERRATA_APPLIES
mov x3, #ERRATA_NOT_APPLIES mov x3, #ERRATA_NOT_APPLIES
@ -170,7 +179,8 @@ func check_errata_dsu_2313941
mov x1, #(0x31 << CLUSTERIDR_REV_SHIFT) mov x1, #(0x31 << CLUSTERIDR_REV_SHIFT)
cmp x0, x1 cmp x0, x1
csel x0, x2, x3, LS csel x0, x2, x3, LS
ret 1:
ret x4
endfunc check_errata_dsu_2313941 endfunc check_errata_dsu_2313941
/* -------------------------------------------------- /* --------------------------------------------------