From: Song Shuai <suagrfillet@gmail.com>
Date: Fri, 19 May 2023 06:08:54 +0000 (+0800)
Subject: riscv: hibernation: Replace jalr with jr before suspend_restore_regs
X-Git-Tag: v6.5-rc1~120^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=650ea2a1dd964ca0a9c55f68dcb614d359c6b7d7;p=thirdparty%2Fkernel%2Flinux.git

riscv: hibernation: Replace jalr with jr before suspend_restore_regs

No need to link the x1/ra reg via jalr before suspend_restore_regs
So it's better to replace jalr with jr.

Signed-off-by: Song Shuai <suagrfillet@gmail.com>
Reviewed-by: JeeHeng Sia <jeeheng.sia@starfivetech.com >
Link: https://lore.kernel.org/r/20230519060854.214138-1-suagrfillet@gmail.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
---

diff --git a/arch/riscv/kernel/hibernate-asm.S b/arch/riscv/kernel/hibernate-asm.S
index effaf5ca5da0e..5c76671c7e157 100644
--- a/arch/riscv/kernel/hibernate-asm.S
+++ b/arch/riscv/kernel/hibernate-asm.S
@@ -50,7 +50,7 @@ ENTRY(hibernate_restore_image)
 	REG_L	s4, restore_pblist
 	REG_L	a1, relocated_restore_code
 
-	jalr	a1
+	jr	a1
 END(hibernate_restore_image)
 
 /*
@@ -73,5 +73,5 @@ ENTRY(hibernate_core_restore_code)
 	REG_L	s4, HIBERN_PBE_NEXT(s4)
 	bnez	s4, .Lcopy
 
-	jalr	s2
+	jr	s2
 END(hibernate_core_restore_code)