ARC: mm: move MMU specific bits out of entry code ...

... to avoid polluting shared entry code (across three ISA variants)
with ISA/MMU specific code.

Cc: Jose Abreu <joabreu@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@kernel.org>

diff --git a/arch/arc/include/asm/mmu.h b/arch/arc/include/asm/mmu.h
index c8b490175eae83547bd6d5b125f3227e2cc150e9..e66e1e417694c9ac8f3c4323a86716c931c134c5 100644 (file)
--- a/arch/arc/include/asm/mmu.h
+++ b/arch/arc/include/asm/mmu.h
@@ -84,6 +84,14 @@ static inline int is_pae40_enabled(void)
 
 extern int pae40_exist_but_not_enab(void);
 
+#else
+
+.macro ARC_MMU_REENABLE reg
+       lr \reg, [ARC_REG_PID]
+       or \reg, \reg, MMU_ENABLE
+       sr \reg, [ARC_REG_PID]
+.endm
+
 #endif /* !__ASSEMBLY__ */
 
 #endif

diff --git a/arch/arc/kernel/entry-arcv2.S b/arch/arc/kernel/entry-arcv2.S
index 12d5f12d10d23b96cbb2ace74a2629aa1ac7257a..a7e6a2174187714f49a243e28c9b5b31eabeecba 100644 (file)
--- a/arch/arc/kernel/entry-arcv2.S
+++ b/arch/arc/kernel/entry-arcv2.S
@@ -10,6 +10,7 @@
 #include <asm/errno.h>
 #include <asm/arcregs.h>
 #include <asm/irqflags.h>
+#include <asm/mmu.h>
 
 ; A maximum number of supported interrupts in the core interrupt controller.
 ; This number is not equal to the maximum interrupt number (256) because

diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S
index 2cb8dfe866b66f2691daa85458db495de5f3aa3a..dd77a0c8f740b6c8be4c688a909b825467e3ff5d 100644 (file)
--- a/arch/arc/kernel/entry.S
+++ b/arch/arc/kernel/entry.S
@@ -101,11 +101,8 @@ ENTRY(EV_MachineCheck)
        lr  r0, [efa]
        mov r1, sp
 
-       ; hardware auto-disables MMU, re-enable it to allow kernel vaddr
-       ; access for say stack unwinding of modules for crash dumps
-       lr      r3, [ARC_REG_PID]
-       or      r3, r3, MMU_ENABLE
-       sr      r3, [ARC_REG_PID]
+       ; MC excpetions disable MMU
+       ARC_MMU_REENABLE r3
 
        lsr     r3, r2, 8
        bmsk    r3, r3, 7