diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-12-11 10:13:34 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:23:40 +0100 |
commit | 3f1bf1f0583f3f82d8458fa29149044451cf950b (patch) | |
tree | 4d7fde1ad0b1bd0d0dead48303c83e905db58786 /arch/arm/cpu/mmu.c | |
parent | b6e633482c16d44f350dce0289cdc8e8ef669045 (diff) | |
download | barebox-3f1bf1f0583f3f82d8458fa29149044451cf950b.tar.gz barebox-3f1bf1f0583f3f82d8458fa29149044451cf950b.tar.xz |
Use cache functions from kernel
These cache functions have been extracted from
arch/arm/boot/compressed/head.S. The old code only worked
properly on ARMv4. Tested on ARMv4, ARMv5, ARMv6 hardware.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu/mmu.c')
-rw-r--r-- | arch/arm/cpu/mmu.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c index 9e00927609..4c4e19620a 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu.c @@ -53,12 +53,10 @@ void mmu_init(void) void mmu_enable(void) { asm volatile ( - "mrc p15, 0, r1, c1, c0, 0;" - "orr r1, r1, #0x0007;" /* enable MMU + Dcache */ - "mcr p15, 0, r1, c1, c0, 0" + "bl __mmu_cache_on;" : : - : "r1" /* Clobber list */ + : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "cc", "memory" ); } @@ -67,28 +65,13 @@ void mmu_enable(void) */ void mmu_disable(void) { + asm volatile ( - "nop; " - "nop; " - "nop; " - "nop; " - "nop; " - "nop; " - /* test, clean and invalidate cache */ - "1: mrc p15, 0, r15, c7, c14, 3;" - " bne 1b;" - " mov pc, lr;" - " mov r0, #0x0;" - " mcr p15, 0, r0, c7, c10, 4;" /* drain the write buffer */ - " mcr p15, 0, r1, c7, c6, 0;" /* clear data cache */ - " mrc p15, 0, r1, c1, c0, 0;" - " bic r1, r1, #0x0007;" /* disable MMU + DCache */ - " mcr p15, 0, r1, c1, c0, 0;" - " mcr p15, 0, r0, c7, c6, 0;" /* flush d-cache */ - " mcr p15, 0, r0, c8, c7, 0;" /* flush i+d-TLBs */ + "bl __mmu_cache_flush;" + "bl __mmu_cache_off;" : : - : "r0" /* Clobber list */ + : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "cc", "memory" ); } |