ARM: hw_breakpoint: ensure OS lock is clear before writing to debug registers
Subsystems (2)
PATCH 1/2 ARM: hw_breakpoint: ensure OS lock is clear before writing to debug registers
ARMv7 architects a system for saving and restoring the debug registers across low-power modes. At the heart of this system is a lock register which, when set, forbids writes to the debug registers. While locked, writes to debug registers via the co-processor interface will result in undefined instruction traps. Linux currently doesn't make use of this feature because we update the debug registers on context switch anyway, however the status of the lock is IMPLEMENTATION DEFINED on reset.
This patch ensures that the lock is cleared during boot so that we can write to the debug registers safely.
--- arch/arm/kernel/hw_breakpoint.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-)
arch/arm/kernel/hw_breakpoint.c +22 -5
@@ -768,6 +768,23 @@ static void __init reset_ctrl_regs(void *unused) {int i; +/* +* v7 debug contains save and restore registers so that debug state +* can be maintained across low-power modes without leaving +* the debug logic powered up. It is IMPLEMENTATION DEFINED whether +* we can write to the debug registers out of reset, so we must +* unlock the OS Lock Access Register to avoid taking undefined +* instruction exceptions later on. +*/ +if (debug_arch >=ARM_DEBUG_ARCH_V7_ECP14 ) { +/* +* Unconditionally clear the lock by writing a value +* other than 0xC5ACCE55 to the access register. +*/ + asmvolatile ("mcr p14, 0, %0, c1, c0, 4" : :"r" (0 )); +isb (); + } +if (enable_monitor_mode ())return ;
@@ -810,17 +827,17 @@ static int __init arch_hw_breakpoint_init(void)pr_warning ("halting debug mode enabled. Assuming maximum " "watchpoint size of 4 bytes." ); }else { -/* Work out the maximum supported watchpoint length. */ - max_watchpoint_len =get_max_wp_len (); -pr_info ("maximum watchpoint size is %u bytes.\n" , - max_watchpoint_len); -/* * Reset the breakpoint resources. We assume that a halting * debugger will leave the world in a nice state for us. */ smp_call_function (reset_ctrl_regs,NULL ,1 );reset_ctrl_regs (NULL ); + +/* Work out the maximum supported watchpoint length. */ + max_watchpoint_len =get_max_wp_len (); +pr_info ("maximum watchpoint size is %u bytes.\n" , + max_watchpoint_len); }/* Register debug fault handler. */
Signature · 1 line
1.7.0.4
PATCH 2/2 ARM: hw_breakpoint: reset control registers in hotplug path
The ARMv7 debug architecture doesn't make any guarantees about the contents of debug control registers following a debug logic reset.
This patch ensures that we reset the control registers when a cpu comes ONLINE (for example, with hotplug) so that when we enable monitor mode while inserting a breakpoint we won't exhibit random behaviour.
--- arch/arm/kernel/hw_breakpoint.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-)
arch/arm/kernel/hw_breakpoint.c +15 -1
@@ -764,7 +764,7 @@ out:/* * One-time initialisation. */ -static void __init reset_ctrl_regs (void *unused) +static void reset_ctrl_regs (void *unused) {int i;
@@ -799,6 +799,18 @@ static void __init reset_ctrl_regs(void *unused) } } +static int __cpuinit dbg_reset_notify (struct notifier_block *self, +unsigned long action,void *cpu) +{ +if (action ==CPU_ONLINE ) +smp_call_function_single ((int )cpu, reset_ctrl_regs,NULL ,1 ); +return NOTIFY_OK ; +} + +static struct notifier_block __cpuinitdata dbg_reset_nb = { + .notifier_call = dbg_reset_notify, +}; +static int __init arch_hw_breakpoint_init (void ) {int ret =0 ;
@@ -846,6 +858,8 @@ static int __init arch_hw_breakpoint_init(void)hook_ifault_code (2 , hw_breakpoint_pending,SIGTRAP ,TRAP_HWBKPT ,"breakpoint debug exception" ); +/* Register hotplug notifier. */ +register_cpu_notifier (&dbg_reset_nb); out:return ret; }
Signature · 1 line
1.7.0.4