From cea15316ceee2d4a51dfdecd79e08a438135416c Mon Sep 17 00:00:00 2001

From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>

Date: Thu, 4 Mar 2021 07:34:11 +0530

Subject: [PATCH] powerpc/64s: Fix instruction encoding for lis in

 ppc_function_entry()

References: bsc#1065729

Patch-mainline: v5.12-rc3

Git-commit: cea15316ceee2d4a51dfdecd79e08a438135416c

'lis r2,N' is 'addis r2,0,N' and the instruction encoding in the macro

LIS_R2 is incorrect (it currently maps to 'addis r0,r2,N'). Fix the

same.

Fixes: c71b7eff426f ("powerpc: Add ABIv2 support to ppc_function_entry")

Cc: stable@vger.kernel.org # v3.16+

Reported-by: Jiri Olsa <jolsa@redhat.com>

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>

Acked-by: Segher Boessenkool <segher@kernel.crashing.org>

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Link: https://lore.kernel.org/r/20210304020411.16796-1-naveen.n.rao@linux.vnet.ibm.com

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 arch/powerpc/include/asm/code-patching.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h

index eacc9102c251..d5b3c3bb95b4 100644

--- a/arch/powerpc/include/asm/code-patching.h

+++ b/arch/powerpc/include/asm/code-patching.h

@@ -73,7 +73,7 @@ void __patch_exception(int exc, unsigned long addr);

 #endif

 #define OP_RT_RA_MASK	0xffff0000UL

-#define LIS_R2		0x3c020000UL

+#define LIS_R2		0x3c400000UL

 #define ADDIS_R2_R12	0x3c4c0000UL

 #define ADDI_R2_R2	0x38420000UL

-- 

2.26.2