ARM: coresight: common definition for (OS) Lock Access Register key value

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / hw_breakpoint.c

diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index 5ff2e77782b185cdcaf18a1636e00ce25b0cf733..34e9375d96a62fa67969b19c7d19686f78bcf3a2 100644 (file)
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -35,6 +35,7 @@
 #include <asm/hw_breakpoint.h>
 #include <asm/kdebug.h>
 #include <asm/traps.h>
+#include <asm/hardware/coresight.h>
 
 /* Breakpoint currently in use for each BRP. */
 static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[ARM_MAX_BRP]);
@@ -955,9 +956,9 @@ static void reset_ctrl_regs(void *unused)
 
        /*
         * Unconditionally clear the OS lock by writing a value
-        * other than 0xC5ACCE55 to the access register.
+        * other than CS_LAR_KEY to the access register.
         */
-       ARM_DBG_WRITE(c1, c0, 4, 0);
+       ARM_DBG_WRITE(c1, c0, 4, ~CS_LAR_KEY);
        isb();
 
        /*