hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: hyp-stub: Use r1 for the soft-restart address 

It is not really obvious why the restart address should be in r3
when communicated to the hyp-stub. r1 should be perfectly adequate,
and consistent with the rest of the code.

Tested-by: Keerthy <j-keerthy@ti.com>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
This commit is contained in:
Marc Zyngier 2017-04-03 19:37:49 +01:00 committed by Christoffer Dall
parent 6b85677c38
commit 6b52f7bdb8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/kernel/hyp-stub.S
View File

@ -214,7 +214,7 @@ __hyp_stub_do_trap:
1: teq r0, #HVC_SOFT_RESTART 1: teq r0, #HVC_SOFT_RESTART
bne 1f bne 1f
bx r3 bx r1
1: mov r0, #-1 1: mov r0, #-1
@ -258,10 +258,9 @@ ENTRY(__hyp_set_vectors)
ENDPROC(__hyp_set_vectors) ENDPROC(__hyp_set_vectors)
ENTRY(__hyp_soft_restart) ENTRY(__hyp_soft_restart)
mov r3, r0 mov r1, r0
mov r0, #HVC_SOFT_RESTART mov r0, #HVC_SOFT_RESTART
__HVC(0) __HVC(0)
mov r0, r3
ret lr ret lr
ENDPROC(__hyp_soft_restart) ENDPROC(__hyp_soft_restart)