Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 344af921 authored by David Howells's avatar David Howells
Browse files

MN10300: Provide a MN10300_CACHE_ENABLED config option 



Provide a MN10300_CACHE_ENABLED config option as inverted logic of
MN10300_CACHE_DISABLED to make things simpler.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
parent 0bc42d7f

arch/mn10300/include/asm/cacheflush.h

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
/*

 * physically-indexed cache management

 */

#ifndef CONFIG_MN10300_CACHE_DISABLED

#ifdef CONFIG_MN10300_CACHE_ENABLED



extern void flush_icache_range(unsigned long start, unsigned long end);

extern void flush_icache_page(struct vm_area_struct *vma, struct page *pg);
@@ -61,7 +61,7 @@ extern void flush_icache_page(struct vm_area_struct *vma, struct page *pg); 
/*

 * primitive routines

 */

#ifndef CONFIG_MN10300_CACHE_DISABLED

#ifdef CONFIG_MN10300_CACHE_ENABLED

extern void mn10300_icache_inv(void);

extern void mn10300_dcache_inv(void);

extern void mn10300_dcache_inv_page(unsigned start);
@@ -103,7 +103,7 @@ extern void mn10300_dcache_flush_inv_range2(unsigned start, unsigned size); 
#define mn10300_dcache_flush_page(start)		do {} while (0)

#define mn10300_dcache_flush_range(start, end)		do {} while (0)

#define mn10300_dcache_flush_range2(start, size)	do {} while (0)

#endif /* CONFIG_MN10300_CACHE_DISABLED */

#endif /* CONFIG_MN10300_CACHE_ENABLED */



/*

 * internal debugging function

arch/mn10300/include/asm/gdb-stub.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ extern asmlinkage void gdbstub_exception(struct pt_regs *, enum exception_code); 
extern asmlinkage void __gdbstub_bug_trap(void);

extern asmlinkage void __gdbstub_pause(void);



#ifndef CONFIG_MN10300_CACHE_DISABLED

#ifdef CONFIG_MN10300_CACHE_ENABLED

extern asmlinkage void gdbstub_purge_cache(void);

#else

#define gdbstub_purge_cache()	do {} while (0)

arch/mn10300/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ unsigned long get_wchan(struct task_struct *p); 


static inline void prefetch(const void *x)

{

#ifndef CONFIG_MN10300_CACHE_DISABLED

#ifdef CONFIG_MN10300_CACHE_ENABLED

#ifdef CONFIG_MN10300_PROC_MN103E010

	asm volatile ("nop; nop; dcpf (%0)" : : "r"(x));

#else
@@ -168,7 +168,7 @@ static inline void prefetch(const void *x) 


static inline void prefetchw(const void *x)

{

#ifndef CONFIG_MN10300_CACHE_DISABLED

#ifdef CONFIG_MN10300_CACHE_ENABLED

#ifdef CONFIG_MN10300_PROC_MN103E010

	asm volatile ("nop; nop; dcpf (%0)" : : "r"(x));

#else

arch/mn10300/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ obj-$(CONFIG_GDBSTUB) += gdb-stub.o gdb-low.o 
obj-$(CONFIG_GDBSTUB_ON_TTYSx) += gdb-io-serial.o gdb-io-serial-low.o

obj-$(CONFIG_GDBSTUB_ON_TTYSMx) += gdb-io-ttysm.o gdb-io-ttysm-low.o



ifneq ($(CONFIG_MN10300_CACHE_DISABLED),y)

ifeq ($(CONFIG_MN10300_CACHE_ENABLED),y)

obj-$(CONFIG_GDBSTUB) += gdb-cache.o

endif

arch/mn10300/kernel/head.S

+3 −3
Original line number Diff line number Diff line
@@ -61,18 +61,18 @@ _start: 
	btst	CHCTR_ICBUSY|CHCTR_DCBUSY,d0		# wait till not busy

	lne



#ifndef CONFIG_MN10300_CACHE_DISABLED

#ifdef CONFIG_MN10300_CACHE_ENABLED

#ifdef CONFIG_MN10300_CACHE_WBACK

#ifndef CONFIG_MN10300_CACHE_WBACK_NOWRALLOC

	mov	CHCTR_ICEN|CHCTR_DCEN|CHCTR_DCWTMD_WRBACK,d0

#else

	mov	CHCTR_ICEN|CHCTR_DCEN|CHCTR_DCWTMD_WRBACK|CHCTR_DCALMD,d0

#endif /* CACHE_DISABLED */

#endif /* NOWRALLOC */

#else

	mov	CHCTR_ICEN|CHCTR_DCEN|CHCTR_DCWTMD_WRTHROUGH,d0

#endif /* WBACK */

	movhu	d0,(a0)					# enable

#endif /* NOWRALLOC */

#endif /* ENABLED */



	# turn on RTS on the debug serial port if applicable

#ifdef CONFIG_MN10300_UNIT_ASB2305