diff mbox

[1/4] ARM: NOMMU: Reorganise __setup_mpu

Message ID 1518434373-27907-2-git-send-email-vladimir.murzin@arm.com
State New, archived
Headers show

Commit Message

Vladimir Murzin Feb. 12, 2018, 11:19 a.m. UTC
Currently, we have mixed code placement between .head.text and .text
depends on configuration we are building:

_text                           M       R(UP)   R(SMP)
diff mbox


 __setup_mpu                    __HEAD  __HEAD  text
 __after_proc_init              __HEAD  __HEAD  text
 __mmap_switched                text    text    text

We are going to support another variant of MPU which is different to
PMSAv7 in sense overlapping MPU regions are not allowed, so this patch
makes boundaries between these sections precise and consistent:

_text                           M       R(UP)   R(SMP)
 __setup_mpu                    __HEAD  __HEAD  __HEAD
 __after_proc_init              text    text    text
 __mmap_switched                text    text    text

Additionally, it paves a path to postpone MPU activation till
__after_proc_init where we do set SCTLR anyway and can return
directly to __mmap_switched.

Tested-by: Szemző András <sza@esh.hu>
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
 arch/arm/kernel/head-nommu.S | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
index 0d17187..aaa25a6 100644
--- a/arch/arm/kernel/head-nommu.S
+++ b/arch/arm/kernel/head-nommu.S
@@ -75,8 +75,8 @@  ENTRY(stext)
 	ldr	r12, [r10, #PROCINFO_INITFUNC]
 	add	r12, r12, r10
 	ret	r12
-1:	bl	__after_proc_init
-	b	__mmap_switched
+1:	ldr	lr, =__mmap_switched
+	b	__after_proc_init
 #ifdef CONFIG_SMP
@@ -123,6 +123,7 @@  __secondary_data:
  * Set the Control Register and Read the process ID.
+	.text
 #ifdef CONFIG_CPU_CP15
@@ -202,6 +203,7 @@  ENDPROC(__after_proc_init)
  * r6: Value to be written to DRSR (and IRSR if required) for PMSAv7_RAM_REGION
+	__HEAD
@@ -301,6 +303,7 @@  ENDPROC(__setup_pmsa_v7)
  * r6: pointer at mpu_rgn_info
+	.text
 	/* Use MPU region info supplied by __cpu_up */
 	ldr	r6, [r7]			@ get secondary_data.mpu_rgn_info