Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dfbf290 authored by Andreas Schwab's avatar Andreas Schwab Committed by Benjamin Herrenschmidt
Browse files

powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S 



Properly set the DABR_TRANSLATION/DABR_DATA_READ/DABR_DATA_READ bits in
the dabr when setting the debug register via PPC_PTRACE_SETHWDEBUG.  Also
don't reject trigger type of PPC_BREAKPOINT_TRIGGER_READ.

Signed-off-by: default avatarAndreas Schwab <schwab@linux-m68k.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 364a1246

arch/powerpc/kernel/ptrace.c

+16 −6
Original line number Diff line number Diff line
@@ -1316,6 +1316,10 @@ static int set_dac_range(struct task_struct *child, 
static long ppc_set_hwdebug(struct task_struct *child,

		     struct ppc_hw_breakpoint *bp_info)

{

#ifndef CONFIG_PPC_ADV_DEBUG_REGS

	unsigned long dabr;

#endif



	if (bp_info->version != 1)

		return -ENOTSUPP;

#ifdef CONFIG_PPC_ADV_DEBUG_REGS
@@ -1353,11 +1357,10 @@ static long ppc_set_hwdebug(struct task_struct *child, 
	/*

	 * We only support one data breakpoint

	 */

	if (((bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_RW) == 0) ||

	    ((bp_info->trigger_type & ~PPC_BREAKPOINT_TRIGGER_RW) != 0) ||

	    (bp_info->trigger_type != PPC_BREAKPOINT_TRIGGER_WRITE) ||

	    (bp_info->addr_mode != PPC_BREAKPOINT_MODE_EXACT) ||

	    (bp_info->condition_mode != PPC_BREAKPOINT_CONDITION_NONE))

	if ((bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_RW) == 0 ||

	    (bp_info->trigger_type & ~PPC_BREAKPOINT_TRIGGER_RW) != 0 ||

	    bp_info->addr_mode != PPC_BREAKPOINT_MODE_EXACT ||

	    bp_info->condition_mode != PPC_BREAKPOINT_CONDITION_NONE)

		return -EINVAL;



	if (child->thread.dabr)
@@ -1366,7 +1369,14 @@ static long ppc_set_hwdebug(struct task_struct *child, 
	if ((unsigned long)bp_info->addr >= TASK_SIZE)

		return -EIO;



	child->thread.dabr = (unsigned long)bp_info->addr;

	dabr = (unsigned long)bp_info->addr & ~7UL;

	dabr |= DABR_TRANSLATION;

	if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_READ)

		dabr |= DABR_DATA_READ;

	if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_WRITE)

		dabr |= DABR_DATA_WRITE;



	child->thread.dabr = dabr;



	return 1;

#endif /* !CONFIG_PPC_ADV_DEBUG_DVCS */