Commit 393a7596 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Thomas Bogendoerfer
Browse files

MIPS: Move declaration of bcache ops to cache.c 



bcache is not tied to CPU's cache interface. Just move those
declaration to cache.c so it can be avaialble to CPU with all
cache types.

Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 101f26c7

arch/mips/include/asm/cache.h

+2 −0
Original line number Diff line number Diff line
@@ -16,4 +16,6 @@ 


#define __read_mostly __section(".data..read_mostly")



extern void cache_noop(void);



#endif /* _ASM_CACHE_H */

arch/mips/mm/c-r4k.c

+0 −14
Original line number Diff line number Diff line
@@ -110,20 +110,6 @@ static unsigned long dcache_size __read_mostly; 
static unsigned long vcache_size __read_mostly;

static unsigned long scache_size __read_mostly;



/*

 * Dummy cache handling routines for machines without boardcaches

 */

static void cache_noop(void) {}



static struct bcache_ops no_sc_ops = {

	.bc_enable = (void *)cache_noop,

	.bc_disable = (void *)cache_noop,

	.bc_wback_inv = (void *)cache_noop,

	.bc_inv = (void *)cache_noop

};



struct bcache_ops *bcops = &no_sc_ops;



#define cpu_is_r4600_v1_x()	((read_c0_prid() & 0xfffffff0) == 0x00002010)

#define cpu_is_r4600_v2_x()	((read_c0_prid() & 0xfffffff0) == 0x00002020)

arch/mips/mm/cache.c

+19 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/highmem.h>

#include <linux/pagemap.h>



#include <asm/bcache.h>

#include <asm/cacheflush.h>

#include <asm/processor.h>

#include <asm/cpu.h>
@@ -56,6 +57,24 @@ EXPORT_SYMBOL_GPL(local_flush_data_cache_page); 
EXPORT_SYMBOL(flush_data_cache_page);

EXPORT_SYMBOL(flush_icache_all);



/*

 * Dummy cache handling routine

 */



void cache_noop(void) {}



#ifdef CONFIG_BOARD_SCACHE



static struct bcache_ops no_sc_ops = {

	.bc_enable = (void *)cache_noop,

	.bc_disable = (void *)cache_noop,

	.bc_wback_inv = (void *)cache_noop,

	.bc_inv = (void *)cache_noop

};



struct bcache_ops *bcops = &no_sc_ops;

#endif



#ifdef CONFIG_DMA_NONCOHERENT



/* DMA cache operations. */