powerpc/cell: Cleanup sysreset_hack for IBM cell blades

This patch adds a config option for the sysreset_hack used for
IBM Cell blades. The code is moves from pervasive.c into ras.c and
gets it's own init method.

Signed-off-by: Christian Krafft <krafft@de.ibm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 1 insertions, 26 deletions

diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c
index 8a3631ce912b..efdacc829576 100644
--- a/arch/powerpc/platforms/cell/pervasive.c
+++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -38,8 +38,6 @@
 
 #include "pervasive.h"
 
-static int sysreset_hack;
-
 static void cbe_power_save(void)
 {
         unsigned long ctrl, thread_switch_control;
@@ -87,9 +85,6 @@ static void cbe_power_save(void)
 
 static int cbe_system_reset_exception(struct pt_regs *regs)
 {
-        int cpu;
-        struct cbe_pmd_regs __iomem *pmd;
-
         switch (regs->msr & SRR1_WAKEMASK) {
         case SRR1_WAKEEE:
                 do_IRQ(regs);
@@ -98,19 +93,7 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
                 timer_interrupt(regs);
                 break;
         case SRR1_WAKEMT:
-                /*
-                 * The BMC can inject user triggered system reset exceptions,
-                 * but cannot set the system reset reason in srr1,
-                 * so check an extra register here.
-                 */
-                if (sysreset_hack && (cpu = smp_processor_id()) == 0) {
-                        pmd = cbe_get_cpu_pmd_regs(cpu);
-                        if (in_be64(&pmd->ras_esc_0) & 0xffff) {
-                                out_be64(&pmd->ras_esc_0, 0);
-                                return 0;
-                        }
-                }
-                break;
+                return cbe_sysreset_hack();
 #ifdef CONFIG_CBE_RAS
         case SRR1_WAKESYSERR:
                 cbe_system_error_exception(regs);
@@ -134,8 +117,6 @@ void __init cbe_pervasive_init(void)
         if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO))
                 return;
 
-        sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
-
         for_each_possible_cpu(cpu) {
                 struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu);
                 if (!regs)
@@ -144,12 +125,6 @@ void __init cbe_pervasive_init(void)
                  /* Enable Pause(0) control bit */
                 out_be64(&regs->pmcr, in_be64(&regs->pmcr) |
                                             CBE_PMD_PAUSE_ZERO_CONTROL);
-
-                /* Enable JTAG system-reset hack */
-                if (sysreset_hack)
-                        out_be32(&regs->fir_mode_reg,
-                                in_be32(&regs->fir_mode_reg) |
-                                CBE_PMD_FIR_MODE_M8);
         }
 
         ppc_md.power_save = cbe_power_save;