[PATCH v2 04/10] arm64/debug: Eliminate magic number from ESR template definition

Dave Martin
2015-07-13T13:25:51Z

<asm/esr.h> has perfectly good constants for defining ESR values
already. Let's use them.

Signed-off-by: Dave Martin <Dave.Martin@arm.com>
---
arch/arm64/include/asm/debug-monitors.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
index ab7d5a8..ff09058 100644
--- a/arch/arm64/include/asm/debug-monitors.h
+++ b/arch/arm64/include/asm/debug-monitors.h
@@ -18,6 +18,7 @@

#ifdef __KERNEL__

+#include <asm/esr.h>
#include <asm/insn.h>

/* Low-level stepping controls. */
@@ -45,7 +46,8 @@
/*
* ESR values expected for dynamic and compile time BRK instruction
*/
-#define DBG_ESR_VAL_BRK(x) (0xf2000000 | ((x) & 0xffff))
+#define DBG_ESR_VAL_BRK(x) \
+ ((ESR_ELx_EC_BRK64 << ESR_ELx_EC_SHIFT) | ESR_ELx_IL | ((x) & 0xffff))

/*
* #imm16 values used for BRK instruction generation
--
1.7.10.4