Browse Source

arm64/debug: Eliminate magic number from ESR template definition

<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>
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>
Dave P Martin 10 năm trước cách đây
mục cha
commit
03923696a9

+ 3 - 1
arch/arm64/include/asm/debug-monitors.h

@@ -18,6 +18,7 @@
 
 
 #ifdef __KERNEL__
 #ifdef __KERNEL__
 
 
+#include <asm/esr.h>
 #include <asm/insn.h>
 #include <asm/insn.h>
 
 
 /* Low-level stepping controls. */
 /* Low-level stepping controls. */
@@ -45,7 +46,8 @@
 /*
 /*
  * ESR values expected for dynamic and compile time BRK instruction
  * 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
  * #imm16 values used for BRK instruction generation