[POWERPC] cell: Support pinhole-reset on IBM cell blades

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / cell / pervasive.c

diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c
index 812bf563ed6509aebeb51606fe8fa068c411bc5c..4ede22d363fa7b701e446193b6b97fb4ec7c5600 100644 (file)
--- a/arch/powerpc/platforms/cell/pervasive.c
+++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -38,6 +38,8 @@
 #include "pervasive.h"
 #include "cbe_regs.h"
 
+static int sysreset_hack;
+
 static void cbe_power_save(void)
 {
        unsigned long ctrl, thread_switch_control;
@@ -85,6 +87,9 @@ 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);
@@ -93,6 +98,18 @@ 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;
 #ifdef CONFIG_CBE_RAS
        case SRR1_WAKESYSERR:
@@ -113,9 +130,12 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
 void __init cbe_pervasive_init(void)
 {
        int cpu;
+
        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)
@@ -124,6 +144,12 @@ 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;