Re: [PATCH] vr41xx: fix problem with vr41xx_cpu_wait

[Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>]

Hello Ricardo,

On Wed, 6 Aug 2008 02:08:18 +0000
Ricardo Mendoza <ricmm@gentoo.org> wrote:

> On Wed, Aug 06, 2008 at 10:49:01AM +0900, Yoichi Yuasa wrote:
>  
> > In VR4100 series User's Manual, it's being written
> > "IE bit of the Status register in the CP0 is also set to 1".
> > 
> > Do you have any problem on your board?
> 
> Hello Yoichi,
> 
> Just now I got my hands on the manual, I can see that the standby
> instruction sets IE bit to 1 but only on Vr4131 and Vr4181A cores, all
> others (such as my Vr4121) need to have interrupts enabled before going
> into standby.
> 
> The patch will make it work on all Vr4100 derivates, or we could also
> add code to build the function depending on CPU type. What do you think?

local_irq_disable() is included in the sample code on the User's Manul. 
I think the following patch is good way of this.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

diff -pruN -X /home/yuasa/Memo/dontdiff 
linux-orig/arch/mips/vr41xx/common/pmu.c linux/arch/mips/vr41xx/common/pmu.c
--- linux-orig/arch/mips/vr41xx/common/pmu.c    2008-08-06 13:23:55.437185676 
+0900
+++ linux/arch/mips/vr41xx/common/pmu.c 2008-08-06 13:32:56.744032999 +0900
@@ -46,11 +46,17 @@ static void __iomem *pmu_base;
 #define pmu_read(offset)               readw(pmu_base + (offset))
 #define pmu_write(offset, value)       writew((value), pmu_base + (offset))
 
+static void old_vr41xx_cpu_wait(void)
+{
+       __asm__("standby;\n");
+}
+
 static void vr41xx_cpu_wait(void)
 {
        local_irq_disable();
        if (!need_resched())
                /*
+                * VR4181A, VR4131 and later,
                 * "standby" sets IE bit of the CP0_STATUS to 1.
                 */
                __asm__("standby;\n");
@@ -124,7 +130,17 @@ static int __init vr41xx_pmu_init(void)
                return -EBUSY;
        }
 
-       cpu_wait = vr41xx_cpu_wait;
+       switch (current_cpu_type()) {
+       case CPU_VR4111:
+       case CPU_VR4121:
+       case CPU_VR4122:
+               cpu_wait = old_vr41xx_cpu_wait;
+               break;
+       default:
+               cpu_wait = vr41xx_cpu_wait;
+               break;
+       }
+
        _machine_restart = vr41xx_restart;
        _machine_halt = vr41xx_halt;
        pm_power_off = vr41xx_halt;