diff --git a/arch/arm/include/asm/hw_breakpoint.h b/arch/arm/include/asm/hw_breakpoint.h
index afcaf8bf971b..704f3add4f3a 100644
--- a/arch/arm/include/asm/hw_breakpoint.h
+++ b/arch/arm/include/asm/hw_breakpoint.h
@@ -52,6 +52,10 @@ static inline void decode_ctrl_reg(u32 reg,
 #define ARM_DEBUG_ARCH_V7_MM	4
 #define ARM_DEBUG_ARCH_V7_1	5
 #define ARM_DEBUG_ARCH_V8	6
+#ifdef CONFIG_AMLOGIC_MODIFY
+/* for cortex-a55 */
+#define ARM_DEBUG_ARCH_V8_1	8
+#endif
 
 /* Breakpoint */
 #define ARM_BREAKPOINT_EXECUTE	0
diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
index bc8f9b1b752c..5026945eb4ec 100644
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
@@ -261,6 +261,9 @@ static int enable_monitor_mode(void)
 	case ARM_DEBUG_ARCH_V7_ECP14:
 	case ARM_DEBUG_ARCH_V7_1:
 	case ARM_DEBUG_ARCH_V8:
+#ifdef CONFIG_AMLOGIC_MODIFY
+	case ARM_DEBUG_ARCH_V8_1:
+#endif
 		ARM_DBG_WRITE(c0, c2, 2, (dscr | ARM_DSCR_MDBGEN));
 		isb();
 		break;
@@ -1041,8 +1044,26 @@ static struct notifier_block dbg_reset_nb = {
 static int dbg_cpu_pm_notify(struct notifier_block *self, unsigned long action,
 			     void *v)
 {
+#ifdef CONFIG_AMLOGIC_MODIFY
+	struct perf_event *wp, **slots;
+	int i;
+
+	if (action == CPU_PM_EXIT) {
+		reset_ctrl_regs(NULL);
+		/* reinstall already installed wp after exit pm */
+		slots = this_cpu_ptr(wp_on_reg);
+		for (i = 0; i < core_num_wrps; ++i) {
+			wp = slots[i];
+			if (wp) {
+				slots[i] = NULL;
+				arch_install_hw_breakpoint(wp);
+			}
+		}
+	}
+#else
 	if (action == CPU_PM_EXIT)
 		reset_ctrl_regs(NULL);
+#endif
 
 	return NOTIFY_OK;
 }