Commit c172d994 authored by Dave P Martin's avatar Dave P Martin Committed by Will Deacon
Browse files

arm64/debug: More consistent naming for the BRK ESR template macro 



The naming of DBG_ESR_VAL_BRK is inconsistent with the way other
similar macros are named.

This patch makes the naming more consistent, and appends "64"
as a reminder that this ESR pattern only matches from AArch64
state.

Signed-off-by: default avatarDave Martin <Dave.Martin@arm.com>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 03923696

arch/arm64/include/asm/debug-monitors.h

+3 −2
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ 
/*

 * ESR values expected for dynamic and compile time BRK instruction

 */

#define DBG_ESR_VAL_BRK(x) \

	((ESR_ELx_EC_BRK64 << ESR_ELx_EC_SHIFT) | ESR_ELx_IL | ((x) & 0xffff))

#define ESR_ELx_VAL_BRK64(imm)					\

	((ESR_ELx_EC_BRK64 << ESR_ELx_EC_SHIFT) | ESR_ELx_IL |	\

	 ((imm) & 0xffff))



/*

 * #imm16 values used for BRK instruction generation

arch/arm64/kernel/kgdb.c

+2 −2
Original line number Diff line number Diff line
@@ -235,13 +235,13 @@ static int kgdb_step_brk_fn(struct pt_regs *regs, unsigned int esr) 


static struct break_hook kgdb_brkpt_hook = {

	.esr_mask	= 0xffffffff,

	.esr_val	= DBG_ESR_VAL_BRK(KGDB_DYN_DBG_BRK_IMM),

	.esr_val	= ESR_ELx_VAL_BRK64(KGDB_DYN_DBG_BRK_IMM),

	.fn		= kgdb_brk_fn

};



static struct break_hook kgdb_compiled_brkpt_hook = {

	.esr_mask	= 0xffffffff,

	.esr_val	= DBG_ESR_VAL_BRK(KGDB_COMPILED_DBG_BRK_IMM),

	.esr_val	= ESR_ELx_VAL_BRK64(KGDB_COMPILED_DBG_BRK_IMM),

	.fn		= kgdb_compiled_brk_fn

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE