[PULL 51/79] ARM: hyp-stub: Use r1 for the soft-restart address

Christoffer Dall cdall at linaro.org
Sun Apr 23 13:09:01 EDT 2017

From: Marc Zyngier <marc.zyngier at arm.com>

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 at ti.com>
Acked-by: Russell King <rmk+kernel at armlinux.org.uk>
Acked-by: Catalin Marinas <catalin.marinas at arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier at arm.com>
Signed-off-by: Christoffer Dall <cdall at linaro.org>
 arch/arm/kernel/hyp-stub.S | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S
index 8301db9..15eaa14 100644
--- a/arch/arm/kernel/hyp-stub.S
+++ b/arch/arm/kernel/hyp-stub.S
@@ -214,7 +214,7 @@ __hyp_stub_do_trap:
 1:	teq	r0, #HVC_SOFT_RESTART
 	bne	1f
-	bx	r3
+	bx	r1
 1:	mov	r0, #-1
@@ -258,10 +258,9 @@ ENTRY(__hyp_set_vectors)
-	mov	r3, r0
+	mov	r1, r0
-	mov	r0, r3
 	ret	lr

More information about the linux-arm-kernel mailing list