Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Blackfin: simplify the do_flush macro

Browse Source 
Simplify the do_flush macro now that we don't need to take into account
a second instruction being used together.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Mike Frysinger 2009-04-10 21:20:19 +00:00
parent f8b556514c
commit 78f28a0a83
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/blackfin/mach-common/cache.S
View File

@ -15,6 +15,13 @@
.text .text
/* 05000443 - IFLUSH cannot be last instruction in hardware loop */
#if ANOMALY_05000443
# define BROK_FLUSH_INST "IFLUSH"
#else
# define BROK_FLUSH_INST "no anomaly! yeah!"
#endif
/* Since all L1 caches work the same way, we use the same method for flushing /* Since all L1 caches work the same way, we use the same method for flushing
* them. Only the actual flush instruction differs. We write this in asm as * them. Only the actual flush instruction differs. We write this in asm as
* GCC can be hard to coax into writing nice hardware loops. * GCC can be hard to coax into writing nice hardware loops.
@ -23,7 +30,7 @@
* R0 = start address * R0 = start address
* R1 = end address * R1 = end address
*/ */
.macro do_flush flushins:req optflushins optnopins label .macro do_flush flushins:req label
R2 = -L1_CACHE_BYTES; R2 = -L1_CACHE_BYTES;
@ -44,22 +51,15 @@
\label : \label :
.endif .endif
P0 = R0; P0 = R0;
LSETUP (1f, 2f) LC1 = P1; LSETUP (1f, 2f) LC1 = P1;
1: 1:
.ifnb \optflushins .ifeqs "\flushins", BROK_FLUSH_INST
\optflushins [P0];
.endif
#if ANOMALY_05000443
.ifb \optnopins
2:
.endif
\flushins [P0++]; \flushins [P0++];
.ifnb \optnopins 2: nop;
2: \optnopins; .else
.endif
#else
2: \flushins [P0++]; 2: \flushins [P0++];
#endif .endif
RTS; RTS;
.endm .endm
@ -77,7 +77,7 @@ ENTRY(_blackfin_icache_flush_range)
*/ */
P0 = R0; P0 = R0;
IFLUSH[P0]; IFLUSH[P0];
do_flush IFLUSH, , nop do_flush IFLUSH
ENDPROC(_blackfin_icache_flush_range) ENDPROC(_blackfin_icache_flush_range)
/* Throw away all D-cached data in specified region without any obligation to /* Throw away all D-cached data in specified region without any obligation to
@ -91,7 +91,7 @@ ENDPROC(_blackfin_dcache_invalidate_range)
/* Flush all data cache lines assocoiated with this memory area */ /* Flush all data cache lines assocoiated with this memory area */
ENTRY(_blackfin_dcache_flush_range) ENTRY(_blackfin_dcache_flush_range)
do_flush FLUSH, , , .Ldfr do_flush FLUSH, .Ldfr
ENDPROC(_blackfin_dcache_flush_range) ENDPROC(_blackfin_dcache_flush_range)
/* Our headers convert the page structure to an address, so just need to flush /* Our headers convert the page structure to an address, so just need to flush