[MIPS] MIPS32/MIPS64 S-cache fix and cleanup

Use blast_scache_range, blast_inv_scache_range for mips32/mips64 scache
routine.  Also initialize waybit for MIPS32/MIPS64 S-cache.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Atsushi Nemoto 2006-06-22 19:42:43 +09:00 committed by Ralf Baechle
parent 86165879a2
commit a2c2bc4b26

View file

@ -24,22 +24,7 @@
*/ */
static void mips_sc_wback_inv(unsigned long addr, unsigned long size) static void mips_sc_wback_inv(unsigned long addr, unsigned long size)
{ {
unsigned long sc_lsize = cpu_scache_line_size(); blast_scache_range(addr, addr + size);
unsigned long end, a;
pr_debug("mips_sc_wback_inv[%08lx,%08lx]", addr, size);
/* Catch bad driver code */
BUG_ON(size == 0);
a = addr & ~(sc_lsize - 1);
end = (addr + size - 1) & ~(sc_lsize - 1);
while (1) {
flush_scache_line(a); /* Hit_Writeback_Inv_SD */
if (a == end)
break;
a += sc_lsize;
}
} }
/* /*
@ -47,22 +32,7 @@ static void mips_sc_wback_inv(unsigned long addr, unsigned long size)
*/ */
static void mips_sc_inv(unsigned long addr, unsigned long size) static void mips_sc_inv(unsigned long addr, unsigned long size)
{ {
unsigned long sc_lsize = cpu_scache_line_size(); blast_inv_scache_range(addr, addr + size);
unsigned long end, a;
pr_debug("mips_sc_inv[%08lx,%08lx]", addr, size);
/* Catch bad driver code */
BUG_ON(size == 0);
a = addr & ~(sc_lsize - 1);
end = (addr + size - 1) & ~(sc_lsize - 1);
while (1) {
invalidate_scache_line(a); /* Hit_Invalidate_SD */
if (a == end)
break;
a += sc_lsize;
}
} }
static void mips_sc_enable(void) static void mips_sc_enable(void)
@ -123,6 +93,7 @@ static inline int __init mips_sc_probe(void)
return 0; return 0;
c->scache.waysize = c->scache.sets * c->scache.linesz; c->scache.waysize = c->scache.sets * c->scache.linesz;
c->scache.waybit = __ffs(c->scache.waysize);
c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT; c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;