diff options
| author | Dave P Martin <Dave.Martin@arm.com> | 2015-07-24 15:37:45 (GMT) |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-07-27 10:08:42 (GMT) |
| commit | 72d033e80a6f25a7e2f79cacac202f19ede289e4 (patch) | |
| tree | 742e176bb5f8c8eda52affe4605aae11609c0826 /arch/arm64 | |
| parent | c172d994e1fd57e46e85424c23124756c66d4b62 (diff) | |
| download | linux-72d033e80a6f25a7e2f79cacac202f19ede289e4.tar.xz | |
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: Dave Martin <Dave.Martin@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/debug-monitors.h | 7 | ||||
| -rw-r--r-- | arch/arm64/include/asm/esr.h | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index bb97e9d..e28b1dd 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -44,13 +44,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 * 0x100: for triggering a fault on purpose (reserved) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 7052245..1b44cf6 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -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> |