Message ID | 1247096778.22069.1.camel@norville.austin.ibm.com (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
On Wed, Jul 08, 2009 at 06:46:18PM -0500, Dave Kleikamp wrote: >On booke processors, gdb is seeing spurious SIGTRAPs when setting a >watchpoint. > >user_disable_single_step() simply quits when the DAC is non-zero. It should >be clearing the DBCR0_IC and DBCR0_BT bits from the dbcr0 register and >TIF_SINGLESTEP from the thread flag. > >Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com> I'll test this first thing in the morning. At first glance it looks pretty good. josh
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c index 9fa2c7d..ef14988 100644 --- a/arch/powerpc/kernel/ptrace.c +++ b/arch/powerpc/kernel/ptrace.c @@ -736,15 +736,16 @@ void user_disable_single_step(struct task_struct *task) { struct pt_regs *regs = task->thread.regs; - -#if defined(CONFIG_BOOKE) - /* If DAC then do not single step, skip */ - if (task->thread.dabr) - return; -#endif - if (regs != NULL) { -#if defined(CONFIG_40x) || defined(CONFIG_BOOKE) +#if defined(CONFIG_BOOKE) + /* If DAC don't clear DBCRO_IDM or MSR_DE */ + if (task->thread.dabr) + task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT); + else { + task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT | DBCR0_IDM); + regs->msr &= ~MSR_DE; + } +#elif defined(CONFIG_40x) task->thread.dbcr0 &= ~(DBCR0_IC | DBCR0_BT | DBCR0_IDM); regs->msr &= ~MSR_DE; #else
On booke processors, gdb is seeing spurious SIGTRAPs when setting a watchpoint. user_disable_single_step() simply quits when the DAC is non-zero. It should be clearing the DBCR0_IC and DBCR0_BT bits from the dbcr0 register and TIF_SINGLESTEP from the thread flag. Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>