From 5c3acfa44ecf98d798c3842e6f86d4d2a4c1cc24 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Fri, 7 Oct 2011 15:57:55 +0100 Subject: [PATCH] --- yaml --- r: 270170 b: refs/heads/master c: a26bce1220a4c5a7a074a779e6aad3cae63a94f7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/hw_breakpoint.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1812c15f3ba7..f00bf5b30785 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c825dda905bac330c2da7fabdf5c0ac28758b3cd +refs/heads/master: a26bce1220a4c5a7a074a779e6aad3cae63a94f7 diff --git a/trunk/arch/arm/kernel/hw_breakpoint.c b/trunk/arch/arm/kernel/hw_breakpoint.c index 5a46225f007e..814a52a9dc39 100644 --- a/trunk/arch/arm/kernel/hw_breakpoint.c +++ b/trunk/arch/arm/kernel/hw_breakpoint.c @@ -892,6 +892,10 @@ static void reset_ctrl_regs(void *unused) * later on. */ switch (debug_arch) { + case ARM_DEBUG_ARCH_V6: + case ARM_DEBUG_ARCH_V6_1: + /* ARMv6 cores just need to reset the registers. */ + goto reset_regs; case ARM_DEBUG_ARCH_V7_ECP14: /* * Ensure sticky power-down is clear (i.e. debug logic is @@ -931,6 +935,7 @@ static void reset_ctrl_regs(void *unused) asm volatile("mcr p14, 0, %0, c0, c7, 0" : : "r" (0)); isb(); +reset_regs: if (enable_monitor_mode()) return;