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

arm64/debug: Move BRK ESR template macro into <asm/esr.h> 



It makes sense to keep all the architectural exception syndrome
definitions in the same place.

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 c172d994

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

+0 −7
Original line number Diff line number Diff line
@@ -43,13 +43,6 @@ 
 */

#define BREAK_INSTR_SIZE		AARCH64_INSN_SIZE



/*

 * ESR values expected for dynamic and compile time BRK instruction

 */

#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

 * Allowed values for kgbd are 0x400 - 0x7ff

arch/arm64/include/asm/esr.h

+7 −0
Original line number Diff line number Diff line
@@ -99,6 +99,13 @@ 
#define ESR_ELx_WFx_ISS_WFE	(UL(1) << 0)

#define ESR_ELx_xVC_IMM_MASK	((1UL << 16) - 1)



/* ESR value templates for specific events */



/* BRK instruction trap from AArch64 state */

#define ESR_ELx_VAL_BRK64(imm)					\

	((ESR_ELx_EC_BRK64 << ESR_ELx_EC_SHIFT) | ESR_ELx_IL |	\

	 ((imm) & 0xffff))



#ifndef __ASSEMBLY__

#include <asm/types.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE