9
0
Fork 0

ARM MMU: call __mmu_cache_* as regular C functions

Now that __mmu_cache_* restore the registers they can be called
as regular C functions. Create a header file for them and use
C functions rather than inline assembly.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2012-08-12 15:26:27 +02:00
parent 8377958958
commit a3a103c95c
2 changed files with 14 additions and 19 deletions

View File

@ -8,6 +8,8 @@
#include <asm/system.h>
#include <memory.h>
#include "mmu.h"
static unsigned long *ttb;
static void create_sections(unsigned long virt, unsigned long phys, int size_m,
@ -21,12 +23,7 @@ static void create_sections(unsigned long virt, unsigned long phys, int size_m,
for (i = size_m; i > 0; i--, virt++, phys++)
ttb[virt] = (phys << 20) | flags;
asm volatile (
"bl __mmu_cache_flush;"
:
:
: "r0", "r1", "r2", "r3", "r6", "r10", "r12", "lr", "cc", "memory"
);
__mmu_cache_flush();
}
/*
@ -255,12 +252,7 @@ static int mmu_init(void)
create_sections(bank->start, bank->start, bank->size >> 20,
PMD_SECT_DEF_CACHED);
asm volatile (
"bl __mmu_cache_on;"
:
:
: "r0", "r1", "r2", "r3", "r6", "r10", "r12", "lr", "cc", "memory"
);
__mmu_cache_on();
/*
* Now that we have the MMU and caches on remap sdram again using
@ -284,13 +276,8 @@ void mmu_disable(void)
if (outer_cache.disable)
outer_cache.disable();
asm volatile (
"bl __mmu_cache_flush;"
"bl __mmu_cache_off;"
:
:
: "r0", "r1", "r2", "r3", "r6", "r10", "r12", "lr", "cc", "memory"
);
__mmu_cache_flush();
__mmu_cache_off();
}
#define PAGE_ALIGN(s) ((s) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);

8
arch/arm/cpu/mmu.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef __ARM_MMU_H
#define __ARM_MMU_H
void __mmu_cache_on(void);
void __mmu_cache_off(void);
void __mmu_cache_flush(void);
#endif /* __ARM_MMU_H */