[PATCH] ppc64: Add ptrace data breakpoint support

Add hardware data breakpoint support.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 4 insertions, 16 deletions

diff --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c
index 45908b10acd3..74e63a886a69 100644
--- a/arch/ppc64/xmon/xmon.c
+++ b/arch/ppc64/xmon/xmon.c
@@ -586,6 +586,8 @@ int xmon_dabr_match(struct pt_regs *regs)
 {
         if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
                 return 0;
+        if (dabr.enabled == 0)
+                return 0;
         xmon_core(regs, 0);
         return 1;
 }
@@ -628,20 +630,6 @@ int xmon_fault_handler(struct pt_regs *regs)
         return 0;
 }
 
-/* On systems with a hypervisor, we can't set the DABR
-   (data address breakpoint register) directly. */
-static void set_controlled_dabr(unsigned long val)
-{
-#ifdef CONFIG_PPC_PSERIES
-        if (systemcfg->platform == PLATFORM_PSERIES_LPAR) {
-                int rc = plpar_hcall_norets(H_SET_DABR, val);
-                if (rc != H_Success)
-                        xmon_printf("Warning: setting DABR failed (%d)\n", rc);
-        } else
-#endif
-                set_dabr(val);
-}
-
 static struct bpt *at_breakpoint(unsigned long pc)
 {
         int i;
@@ -728,7 +716,7 @@ static void insert_bpts(void)
 static void insert_cpu_bpts(void)
 {
         if (dabr.enabled)
-                set_controlled_dabr(dabr.address | (dabr.enabled & 7));
+                set_dabr(dabr.address | (dabr.enabled & 7));
         if (iabr && cpu_has_feature(CPU_FTR_IABR))
                 set_iabr(iabr->address
                          | (iabr->enabled & (BP_IABR|BP_IABR_TE)));
@@ -756,7 +744,7 @@ static void remove_bpts(void)
 
 static void remove_cpu_bpts(void)
 {
-        set_controlled_dabr(0);
+        set_dabr(0);
         if (cpu_has_feature(CPU_FTR_IABR))
                 set_iabr(0);
 }