devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Cache functions should include data and instruction barriers.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17150 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2008-04-17 00:07:06 +00:00
parent 7fee4868f9
commit 99a65dfc1e
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
firmware/target/arm/imx31/gigabeat-s/system-target.h
View file

@ -42,8 +42,13 @@ static inline void invalidate_icache(void)
asm volatile( asm volatile(
/* Clean and invalidate entire data cache */ /* Clean and invalidate entire data cache */
"mcr p15, 0, %0, c7, c14, 0 \n" "mcr p15, 0, %0, c7, c14, 0 \n"
/* Invalidate entire instruction cache */ /* Invalidate entire intruction cache
* Also flushes the branch target cache */
"mcr p15, 0, %0, c7, c5, 0 \n" "mcr p15, 0, %0, c7, c5, 0 \n"
/* Data synchronization barrier */
"mcr p15, 0, %0, c7, c10, 4 \n"
/* Flush prefetch buffer */
"mcr p15, 0, %0, c7, c5, 4 \n"
: : "r"(0) : : "r"(0)
); );
} }
@ -54,6 +59,8 @@ static inline void flush_icache(void)
asm volatile ( asm volatile (
/* Clean entire data cache */ /* Clean entire data cache */
"mcr p15, 0, %0, c7, c10, 0 \n" "mcr p15, 0, %0, c7, c10, 0 \n"
/* Data synchronization barrier */
"mcr p15, 0, r2, c7, c10, 4 \n"
: : "r"(0) : : "r"(0)
); );
} }

16
firmware/target/arm/mmu-arm.c
View file

@ -90,9 +90,11 @@ void enable_mmu(void) {
void __attribute__((naked)) invalidate_dcache_range(const void *base, unsigned int size) void __attribute__((naked)) invalidate_dcache_range(const void *base, unsigned int size)
{ {
asm volatile( asm volatile(
"add r1, r1, r0 \n" "add r1, r1, r0 \n"
"mcrr p15, 0, r1, r0, c14 \n" "mov r2, #0 \n"
"bx lr \n" "mcrr p15, 0, r1, r0, c14 \n" /* Clean and invalidate dcache range */
"mcr p15, 0, r2, c7, c10, 4 \n" /* Data synchronization barrier */
"bx lr \n"
); );
(void)base; (void)size; (void)base; (void)size;
} }
@ -140,9 +142,11 @@ void invalidate_dcache_range(const void *base, unsigned int size) {
void __attribute__((naked)) clean_dcache_range(const void *base, unsigned int size) void __attribute__((naked)) clean_dcache_range(const void *base, unsigned int size)
{ {
asm volatile( asm volatile(
"add r1, r1, r0 \n" "add r1, r1, r0 \n"
"mcrr p15, 0, r1, r0, c12 \n" "mov r2, #0 \n"
"bx lr \n" "mcrr p15, 0, r1, r0, c12 \n" /* Clean dcache range */
"mcr p15, 0, r2, c7, c10, 4 \n" /* Data synchronization barrier */
"bx lr \n"
); );
(void)base; (void)size; (void)base; (void)size;
} }