Commit e08021f8 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/ebpf64: Use PPC_RAW_MFLR() 



Use PPC_RAW_MFLR() instead of open coding with PPC_INST_MFLR.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/c1887623e91e8b4da36e669e4c74de86320a5092.1621506159.git.christophe.leroy@csgroup.eu
parent 5a03e1e9

arch/powerpc/include/asm/ppc-opcode.h

+1 −2
Original line number Diff line number Diff line
@@ -286,7 +286,6 @@ 
#define PPC_INST_TSR			0x7c0005dd

#define PPC_INST_LD			0xe8000000

#define PPC_INST_STD			0xf8000000

#define PPC_INST_MFLR			0x7c0802a6

#define PPC_INST_ADDIS			0x3c000000

#define PPC_INST_ADD			0x7c000214

#define PPC_INST_DIVD			0x7c0003d2
@@ -480,7 +479,7 @@ 
#define PPC_RAW_BLR()			(0x4e800020)

#define PPC_RAW_BLRL()			(0x4e800021)

#define PPC_RAW_MTLR(r)			(0x7c0803a6 | ___PPC_RT(r))

#define PPC_RAW_MFLR(t)			(PPC_INST_MFLR | ___PPC_RT(t))

#define PPC_RAW_MFLR(t)			(0x7c0802a6 | ___PPC_RT(t))

#define PPC_RAW_BCTR()			(0x4e800420)

#define PPC_RAW_BCTRL()			(0x4e800421)

#define PPC_RAW_MTCTR(r)		(0x7c0903a6 | ___PPC_RT(r))

arch/powerpc/net/bpf_jit_comp64.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx) 
		 * save/restore LR unless we call other functions

		 */

		if (ctx->seen & SEEN_FUNC) {

			EMIT(PPC_INST_MFLR | __PPC_RT(R0));

			EMIT(PPC_RAW_MFLR(_R0));

			PPC_BPF_STL(0, 1, PPC_LR_STKOFF);

		}