From 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Mon, 4 May 1998 09:12:48 +0000 Subject: o New memset. Fastest in town for size > 6 bytes. o New clear_user. o Memcpy now efficiently copies the (src^dest)&3 != 0. o Memmove new correctly deals with overlaps o Rewrite csum_partial in assembler. o Rewrte csum_partial_from_user in assembler. o __copy_user is now integrated with memcpy. o get_user now returns a zero value on error. o copy_from_user now clears the destination buffer on error. o strncpy_user now has a more efficient caller routine. o strlen_user now has a more efficient caller routines and is faster. o The unaligned handler is now much cleaner. It's now also save from interrupt. Some more esotheric bugs fixed as well. o Don't export bcopy anymore, it's now a inline function. o Delete ancient junk from the first days of Linux/MIPS. o Delete dead code in indy_sc.c. o Including the IDE driver doesn't crash an Indy anymore. o Eleminate active_ds. We now use current_ds directly in the thread structure which is faster and threadsafe. Saves almost 2kb on the kernel. o Serial console should work again. --- arch/mips/sgi/kernel/indy_sc.c | 57 +++++++----------------------------------- 1 file changed, 9 insertions(+), 48 deletions(-) (limited to 'arch/mips/sgi/kernel/indy_sc.c') diff --git a/arch/mips/sgi/kernel/indy_sc.c b/arch/mips/sgi/kernel/indy_sc.c index b7466339a..81c18cb09 100644 --- a/arch/mips/sgi/kernel/indy_sc.c +++ b/arch/mips/sgi/kernel/indy_sc.c @@ -4,7 +4,7 @@ * Copyright (C) 1997 Ralf Baechle (ralf@gnu.org), * derived from r4xx0.c by David S. Miller (dm@engr.sgi.com). * - * $Id: indy_sc.c,v 1.2 1998/03/27 04:47:57 ralf Exp $ + * $Id: indy_sc.c,v 1.3 1998/04/05 11:23:58 ralf Exp $ */ #include #include @@ -23,20 +23,8 @@ #include #include -/* CP0 hazard avoidance. */ -#define BARRIER __asm__ __volatile__(".set noreorder\n\t" \ - "nop; nop; nop; nop; nop; nop;\n\t" \ - ".set reorder\n\t") - -/* Primary cache parameters. */ -static int icache_size, dcache_size; /* Size in bytes */ -static int ic_lsize, dc_lsize; /* LineSize in bytes */ - -/* Secondary cache (if present) parameters. */ -static scache_size, sc_lsize; /* Again, in bytes */ - -#include -#include +/* Secondary cache size in bytes, if present. */ +static unsigned long scache_size; #undef DEBUG_CACHE @@ -166,7 +154,6 @@ __initfunc(static inline int indy_sc_probe(void)) volatile unsigned int *cpu_control; unsigned short cmd = 0xc220; unsigned long data = 0; - unsigned long addr; int i, n; #ifdef __MIPSEB__ @@ -209,43 +196,17 @@ __initfunc(static inline int indy_sc_probe(void)) DEASSERT(SGIMC_EEPROM_CSEL); ASSERT(SGIMC_EEPROM_PRE); ASSERT(SGIMC_EEPROM_SECLOCK); + data <<= PAGE_SHIFT; - printk("R4600/R5000 SCACHE size %dK ", (int) (data >> 10)); - switch(mips_cputype) { - case CPU_R4600: - case CPU_R4640: - sc_lsize = 32; - break; + if (data == 0) + return 0; - default: - sc_lsize = 128; - break; - } - printk("linesize %d bytes\n", sc_lsize); scache_size = data; - if (data == 0) { - if (mips_cputype == CPU_R5000) - return -1; - else - return 0; - } - - /* Enable r4600/r5000 cache. But flush it first. */ - for(addr = KSEG0; addr < (KSEG0 + dcache_size); - addr += dc_lsize) - flush_dcache_line_indexed(addr); - for(addr = KSEG0; addr < (KSEG0 + icache_size); - addr += ic_lsize) - flush_icache_line_indexed(addr); - for(addr = KSEG0; addr < (KSEG0 + scache_size); - addr += sc_lsize) - flush_scache_line_indexed(addr); - if (mips_cputype == CPU_R4600 || - mips_cputype == CPU_R5000) - return 1; + printk("R4600/R5000 SCACHE size %ldK, linesize 32 bytes.\n", + scache_size >> 10); - return 0; + return 1; } /* XXX Check with wje if the Indy caches can differenciate between -- cgit v1.2.3