Commit 74bbe3f0 authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Michael Ellerman
Browse files

powerpc/bpf: Rename PPC_BL_ABS() to PPC_BL() 



PPC_BL_ABS() is just doing a relative branch with link. The name
suggests that it is for branching to an absolute address, which is
incorrect. Rename the macro to a more appropriate PPC_BL().

Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/f0e57b6c7a6ee40dba645535b70da46f46e8af5e.1644834730.git.naveen.n.rao@linux.vnet.ibm.com
parent feb63072

arch/powerpc/net/bpf_jit.h

+3 −3
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ 
		EMIT(PPC_RAW_BRANCH(offset));				      \

	} while (0)



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

#define PPC_BL_ABS(dest)	EMIT(PPC_INST_BL |			      \

				     (((dest) - (unsigned long)(image + ctx->idx)) & 0x03fffffc))

/* bl (unconditional 'branch' with link) */

#define PPC_BL(dest)	EMIT(PPC_INST_BL | (((dest) - (unsigned long)(image + ctx->idx)) & 0x03fffffc))



/* "cond" here covers BO:BI fields. */

#define PPC_BCC_SHORT(cond, dest)					      \

	do {								      \

arch/powerpc/net/bpf_jit_comp32.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int bpf_jit_emit_func_call_rel(u32 *image, struct codegen_context *ctx, u64 func 
	s32 rel = (s32)func - (s32)(image + ctx->idx);



	if (image && rel < 0x2000000 && rel >= -0x2000000) {

		PPC_BL_ABS(func);

		PPC_BL(func);

		EMIT(PPC_RAW_NOP());

		EMIT(PPC_RAW_NOP());

		EMIT(PPC_RAW_NOP());