[PATCH 4.14 88/95] powerpc/64s: Fix instruction encoding for lis in ppc_function_entry()
From: gregkh@linuxfoundation.org
Date: 2021-03-15 14:28:12
Also in:
lkml
From: gregkh@linuxfoundation.org
Date: 2021-03-15 14:28:12
Also in:
lkml
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
From: Naveen N. Rao <redacted>
commit cea15316ceee2d4a51dfdecd79e08a438135416c upstream.
'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 <redacted>
Signed-off-by: Naveen N. Rao <redacted>
Acked-by: Segher Boessenkool <redacted>
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 (local)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
arch/powerpc/include/asm/code-patching.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/powerpc/include/asm/code-patching.h
+++ b/arch/powerpc/include/asm/code-patching.h@@ -51,7 +51,7 @@ void __patch_exception(int exc, unsigned #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