diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-08 12:57:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-03-23 07:43:27 +0100 |
| commit | 7ca5bc00f65db4931fb262e1bfbc0b562dadd737 (patch) | |
| tree | d44069fc5e3c980b250918d345cc08557c56da9d | |
| parent | 8e9f557c607eef90a5c3de7400721e3b78a6c1e9 (diff) | |
| download | barebox-7ca5bc00f65db4931fb262e1bfbc0b562dadd737.tar.gz barebox-7ca5bc00f65db4931fb262e1bfbc0b562dadd737.tar.xz | |
ARM: aarch64: mmu: enable mmu in generic code
Using board code to enable the MMU is not nice. Do it in generic
code. Since mmu_enable() is now done in mmu_64.c we no longer have
to export it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/boards/qemu-virt64/init.c | 10 | ||||
| -rw-r--r-- | arch/arm/cpu/mmu_64.c | 20 | ||||
| -rw-r--r-- | arch/arm/include/asm/mmu.h | 1 |
3 files changed, 8 insertions, 23 deletions
diff --git a/arch/arm/boards/qemu-virt64/init.c b/arch/arm/boards/qemu-virt64/init.c index 686231696e..19cfcae1f0 100644 --- a/arch/arm/boards/qemu-virt64/init.c +++ b/arch/arm/boards/qemu-virt64/init.c @@ -62,13 +62,3 @@ static int virt_core_init(void) return 0; } postcore_initcall(virt_core_init); - -#ifdef CONFIG_MMU -static int virt_mmu_enable(void) -{ - mmu_enable(); - - return 0; -} -postmmu_initcall(virt_mmu_enable); -#endif diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c index 639aa6d189..695a73262d 100644 --- a/arch/arm/cpu/mmu_64.c +++ b/arch/arm/cpu/mmu_64.c @@ -210,6 +210,12 @@ int arch_remap_range(void *_start, size_t size, unsigned flags) return 0; } +static void mmu_enable(void) +{ + isb(); + set_cr(get_cr() | CR_M | CR_C | CR_I); +} + /* * Prepare MMU for usage enable it. */ @@ -256,22 +262,12 @@ static int mmu_init(void) for_each_memory_bank(bank) create_sections(bank->start, bank->start, bank->size, CACHED_MEM); + mmu_enable(); + return 0; } mmu_initcall(mmu_init); -void mmu_enable(void) -{ - if (!ttb) - arm_mmu_not_initialized_error(); - - if (!(get_cr() & CR_M)) { - - isb(); - set_cr(get_cr() | CR_M | CR_C | CR_I); - } -} - void mmu_disable(void) { unsigned int cr; diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h index 2a1daeafe3..840851858f 100644 --- a/arch/arm/include/asm/mmu.h +++ b/arch/arm/include/asm/mmu.h @@ -8,7 +8,6 @@ struct arm_memory; -void mmu_enable(void); void mmu_disable(void); static inline void arm_create_section(unsigned long virt, unsigned long phys, int size_m, unsigned int flags) |