mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
[MIPS] sc-rm7k.c cleanup
Use blast_scache_range, blast_inv_scache_range for rm7k scache routine. Output code should be logically same. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
bbad8123f3
commit
37caa934af
2 changed files with 10 additions and 16 deletions
|
@ -9,6 +9,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/bitops.h>
|
||||
|
||||
#include <asm/addrspace.h>
|
||||
#include <asm/bcache.h>
|
||||
|
@ -43,14 +44,7 @@ static void rm7k_sc_wback_inv(unsigned long addr, unsigned long 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;
|
||||
}
|
||||
blast_scache_range(addr, addr + size);
|
||||
|
||||
if (!rm7k_tcache_enabled)
|
||||
return;
|
||||
|
@ -74,14 +68,7 @@ static void rm7k_sc_inv(unsigned long addr, unsigned long 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;
|
||||
}
|
||||
blast_inv_scache_range(addr, addr + size);
|
||||
|
||||
if (!rm7k_tcache_enabled)
|
||||
return;
|
||||
|
@ -143,11 +130,17 @@ struct bcache_ops rm7k_sc_ops = {
|
|||
|
||||
void __init rm7k_sc_init(void)
|
||||
{
|
||||
struct cpuinfo_mips *c = ¤t_cpu_data;
|
||||
unsigned int config = read_c0_config();
|
||||
|
||||
if ((config & RM7K_CONF_SC))
|
||||
return;
|
||||
|
||||
c->scache.linesz = sc_lsize;
|
||||
c->scache.ways = 4;
|
||||
c->scache.waybit= ffs(scache_size / c->scache.ways) - 1;
|
||||
c->scache.waysize = scache_size / c->scache.ways;
|
||||
c->scache.sets = scache_size / (c->scache.linesz * c->scache.ways);
|
||||
printk(KERN_INFO "Secondary cache size %dK, linesize %d bytes.\n",
|
||||
(scache_size >> 10), sc_lsize);
|
||||
|
||||
|
|
|
@ -303,5 +303,6 @@ __BUILD_BLAST_CACHE_RANGE(d, dcache, Hit_Writeback_Inv_D, )
|
|||
__BUILD_BLAST_CACHE_RANGE(s, scache, Hit_Writeback_Inv_SD, )
|
||||
/* blast_inv_dcache_range */
|
||||
__BUILD_BLAST_CACHE_RANGE(inv_d, dcache, Hit_Invalidate_D, )
|
||||
__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD, )
|
||||
|
||||
#endif /* _ASM_R4KCACHE_H */
|
||||
|
|
Loading…
Reference in a new issue