bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc: arm: viper: Fix callee saved register corruption in el3 init

Browse Source 
x19 is callee saved register. z_arch_el3_plat_init being a callee,
it should save it before using it. However, at this point, stack
has not been setup. So, let's just use x20 instead which is not
being used caller yet. This bug was causing VBAR_EL1 corruption,
but since [10:0] bits are reserved, bug was hidden.

Signed-off-by: Abhishek Shah <abhishek.shah@broadcom.com>
This commit is contained in:
Abhishek Shah 2020-07-10 11:58:28 +05:30 committed by Carles Cufí
parent 8344b8080b
commit 3a63e8564e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soc/arm/bcm_vk/viper/plat_core.S
View File

@ -20,7 +20,7 @@ GTEXT(plat_l2_init)
SECTION_FUNC(TEXT, z_arch_el3_plat_init)
mov x19, x30
mov x20, x30
/* Enable GIC v3 system interface */
mov_imm x0, (ICC_SRE_ELx_DFB | ICC_SRE_ELx_DIB | \
ICC_SRE_ELx_SRE | ICC_SRE_EL3_EN)
@ -28,7 +28,7 @@ SECTION_FUNC(TEXT, z_arch_el3_plat_init)
/* L2 config */
bl plat_l2_init
mov x30, x19
mov x30, x20
ret