powerpc/book3e-64: Fix debug support for userspace

With the introduction of CONFIG_PPC_ADV_DEBUG_REGS user space debug is
broken on Book-E 64-bit parts that support delayed debug events.  When
switch_booke_debug_regs() sets DBCR0 we'll start getting debug events as
MSR_DE is also set and we aren't able to handle debug events from kernel
space.

We can remove the hack that always enables MSR_DE and loads up DBCR0 and
just utilize switch_booke_debug_regs() to get user space debug working
again.

We still need to handle critical/debug exception stacks & proper
save/restore of state for those exception levles to support debug events
from kernel space like we have on 32-bit.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 0 insertions, 22 deletions

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index ad3612af0a04..6457574c0b2f 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -486,28 +486,6 @@ struct task_struct *__switch_to(struct task_struct *prev,
         new_thread = &new->thread;
         old_thread = &current->thread;
 
-#if defined(CONFIG_PPC_BOOK3E_64)
-        /* XXX Current Book3E code doesn't deal with kernel side DBCR0,
-         * we always hold the user values, so we set it now.
-         *
-         * However, we ensure the kernel MSR:DE is appropriately cleared too
-         * to avoid spurrious single step exceptions in the kernel.
-         *
-         * This will have to change to merge with the ppc32 code at some point,
-         * but I don't like much what ppc32 is doing today so there's some
-         * thinking needed there
-         */
-        if ((new_thread->dbcr0 | old_thread->dbcr0) & DBCR0_IDM) {
-                u32 dbcr0;
-
-                mtmsr(mfmsr() & ~MSR_DE);
-                isync();
-                dbcr0 = mfspr(SPRN_DBCR0);
-                dbcr0 = (dbcr0 & DBCR0_EDM) | new_thread->dbcr0;
-                mtspr(SPRN_DBCR0, dbcr0);
-        }
-#endif /* CONFIG_PPC64_BOOK3E */
-
 #ifdef CONFIG_PPC64
         /*
          * Collect processor utilization data per process