Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4dfbf290aeb9d63a058d9d8237203b0b72bfbbe3

Authored by Andreas Schwab
Committed by Benjamin Herrenschmidt
1 parent 364a124652
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 1 changed file with 16 additions and 6 deletions Side-by-side Diff

arch/powerpc/kernel/ptrace.c
Diff comments   View file @ 4dfbf29
... ... @@ -1316,6 +1316,10 @@
1316 1316 static long ppc_set_hwdebug(struct task_struct *child,
1317 1317 struct ppc_hw_breakpoint *bp_info)
1318 1318 {
  1319 +#ifndef CONFIG_PPC_ADV_DEBUG_REGS
  1320 + unsigned long dabr;
  1321 +#endif
  1322 +
1319 1323 if (bp_info->version != 1)
1320 1324 return -ENOTSUPP;
1321 1325 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
... ... @@ -1353,11 +1357,10 @@
1353 1357 /*
1354 1358 * We only support one data breakpoint
1355 1359 */
1356   - if (((bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_RW) == 0) ||
1357   - ((bp_info->trigger_type & ~PPC_BREAKPOINT_TRIGGER_RW) != 0) ||
1358   - (bp_info->trigger_type != PPC_BREAKPOINT_TRIGGER_WRITE) ||
1359   - (bp_info->addr_mode != PPC_BREAKPOINT_MODE_EXACT) ||
1360   - (bp_info->condition_mode != PPC_BREAKPOINT_CONDITION_NONE))
  1360 + if ((bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_RW) == 0 ||
  1361 + (bp_info->trigger_type & ~PPC_BREAKPOINT_TRIGGER_RW) != 0 ||
  1362 + bp_info->addr_mode != PPC_BREAKPOINT_MODE_EXACT ||
  1363 + bp_info->condition_mode != PPC_BREAKPOINT_CONDITION_NONE)
1361 1364 return -EINVAL;
1362 1365  
1363 1366 if (child->thread.dabr)
... ... @@ -1366,7 +1369,14 @@
1366 1369 if ((unsigned long)bp_info->addr >= TASK_SIZE)
1367 1370 return -EIO;
1368 1371  
1369   - child->thread.dabr = (unsigned long)bp_info->addr;
  1372 + dabr = (unsigned long)bp_info->addr & ~7UL;
  1373 + dabr |= DABR_TRANSLATION;
  1374 + if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_READ)
  1375 + dabr |= DABR_DATA_READ;
  1376 + if (bp_info->trigger_type & PPC_BREAKPOINT_TRIGGER_WRITE)
  1377 + dabr |= DABR_DATA_WRITE;
  1378 +
  1379 + child->thread.dabr = dabr;
1370 1380  
1371 1381 return 1;
1372 1382 #endif /* !CONFIG_PPC_ADV_DEBUG_DVCS */