Re: Troubles in r2300.c

[Alexandr Andreev <andreev@niisi.msk.ru>]

Ralf Baechle wrote:

> Alexandr,
>
> your MUA has garbled your patch, so I was forced to apply it manually.
> Mozilla is known to be evil in that respect like a few more mailers.
> For future patches please use a mailer that doesn't change patches in
> creative ways. Thanks for your patch,
>
> Ralf
Oh, I'm sorry, i forgot to substitute one save_and_cli() and restore ...
Please, apply new patch.



Index: arch/mips/mm/r2300.c
===================================================================
RCS file: /share/cvs/root/linux/arch/mips/mm/r2300.c,v
retrieving revision 1.12
diff -u -r1.12 r2300.c
--- arch/mips/mm/r2300.c        2001/05/31 14:27:32     1.12
+++ arch/mips/mm/r2300.c        2001/06/07 14:28:29
@@ -125,7 +125,7 @@
 
        p = (volatile unsigned long *) KSEG0;
 
-       save_and_cli(flags);
+       flags = read_32bit_cp0_register(CP0_STATUS);
 
        /* isolate cache space */
        write_32bit_cp0_register(CP0_STATUS, (ca_flags|flags)&~ST0_IEC);
@@ -147,7 +147,7 @@
                if (size > 0x40000)
                        size = 0;
        }
-       restore_flags(flags);
+       write_32bit_cp0_register(CP0_STATUS, flags);
 
        return size * sizeof(*p);
 }
@@ -170,7 +170,7 @@
        if (size > icache_size)
                size = icache_size;
 
-       save_and_cli(flags);
+       flags = read_32bit_cp0_register(CP0_STATUS);
 
        /* isolate cache space */
        write_32bit_cp0_register(CP0_STATUS, (ST0_ISC|ST0_SWC|flags)&~ST0_IEC);
@@ -212,7 +212,7 @@
                p += 0x080;
        }
 
-       restore_flags(flags);
+       write_32bit_cp0_register(CP0_STATUS, flags);
 }
 
 static void r3k_flush_dcache_range(unsigned long start, unsigned long end)
@@ -224,7 +224,7 @@
        if (size > dcache_size)
                size = dcache_size;
 
-       save_and_cli(flags);
+       flags = read_32bit_cp0_register(CP0_STATUS);
 
        /* isolate cache space */
        write_32bit_cp0_register(CP0_STATUS, (ST0_ISC|flags)&~ST0_IEC);
@@ -266,7 +266,7 @@
                p += 0x080;
        }
 
-       restore_flags(flags);
+       write_32bit_cp0_register(CP0_STATUS, flags);
 }
 
 static inline unsigned long get_phys_page (unsigned long addr,
@@ -389,7 +389,7 @@
        printk("csigtramp[%08lx]", addr);
 #endif
 
-       save_and_cli(flags);
+       flags = read_32bit_cp0_register(CP0_STATUS);
 
        write_32bit_cp0_register(CP0_STATUS, (ST0_ISC|ST0_SWC|flags)&~ST0_IEC);
 
@@ -398,7 +398,7 @@
                "sb\t$0,0x008(%0)\n\t"
                : : "r" (addr) );
 
-       restore_flags(flags);
+       write_32bit_cp0_register(CP0_STATUS, flags);
 }
 
 static void r3k_dma_cache_wback_inv(unsigned long start, unsigned long size)
@@ -714,6 +714,7 @@
                case CPU_R3000:
                case CPU_R3000A:
                case CPU_R3081:
+               case CPU_R3081E:
 
                        r3k_probe_cache();