Commit f15a71b3 authored by Hari Bathini's avatar Hari Bathini Committed by Michael Ellerman
Browse files

powerpc/ppc-opcode: introduce PPC_RAW_BRANCH() macro 



Define and use PPC_RAW_BRANCH() macro instead of open coding it. This
macro is used while adding BPF_PROBE_MEM support.

Signed-off-by: default avatarHari Bathini <hbathini@linux.ibm.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211012123056.485795-5-hbathini@linux.ibm.com
parent efa95f03

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

+2 −0
Original line number Diff line number Diff line
@@ -566,6 +566,8 @@ 
#define PPC_RAW_MTSPR(spr, d)		(0x7c0003a6 | ___PPC_RS(d) | __PPC_SPR(spr))

#define PPC_RAW_EIEIO()			(0x7c0006ac)



#define PPC_RAW_BRANCH(addr)		(PPC_INST_BRANCH | ((addr) & 0x03fffffc))



/* Deal with instructions that older assemblers aren't aware of */

#define	PPC_BCCTR_FLUSH		stringify_in_c(.long PPC_INST_BCCTR_FLUSH)

#define	PPC_CP_ABORT		stringify_in_c(.long PPC_RAW_CP_ABORT)

arch/powerpc/net/bpf_jit.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
			pr_err_ratelimited("Branch offset 0x%lx (@%u) out of range\n", offset, ctx->idx);			\

			return -ERANGE;					      \

		}							      \

		EMIT(PPC_INST_BRANCH | (offset & 0x03fffffc));		      \

		EMIT(PPC_RAW_BRANCH(offset));				      \

	} while (0)



/* blr; (unconditional 'branch' with link) to absolute address */