Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72662e01 authored by Will Deacon's avatar Will Deacon
Browse files

ARM: head.S: only include __turn_mmu_on in the initial identity mapping 



__create_page_tables identity maps the region of memory from
__enable_mmu to the end of __turn_mmu_on.

In preparation for including __turn_mmu_on in the .idmap.text section,
this patch modifies the identity mapping so that it only includes the
__turn_mmu_on code.

Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 2c8951ab

arch/arm/kernel/head.S

+7 −7
Original line number Original line Diff line number Diff line
@@ -170,11 +170,11 @@ __create_page_tables: 
	 * Create identity mapping to cater for __enable_mmu.

	 * Create identity mapping to cater for __enable_mmu.

	 * This identity mapping will be removed by paging_init().

	 * This identity mapping will be removed by paging_init().

	 */

	 */

	adr	r0, __enable_mmu_loc

	adr	r0, __turn_mmu_on_loc

	ldmia	r0, {r3, r5, r6}

	ldmia	r0, {r3, r5, r6}

	sub	r0, r0, r3			@ virt->phys offset

	sub	r0, r0, r3			@ virt->phys offset

	add	r5, r5, r0			@ phys __enable_mmu

	add	r5, r5, r0			@ phys __turn_mmu_on

	add	r6, r6, r0			@ phys __enable_mmu_end

	add	r6, r6, r0			@ phys __turn_mmu_on_end

	mov	r5, r5, lsr #SECTION_SHIFT

	mov	r5, r5, lsr #SECTION_SHIFT

	mov	r6, r6, lsr #SECTION_SHIFT

	mov	r6, r6, lsr #SECTION_SHIFT
@@ -287,10 +287,10 @@ __create_page_tables: 
ENDPROC(__create_page_tables)

ENDPROC(__create_page_tables)

	.ltorg

	.ltorg

	.align

	.align

__enable_mmu_loc:

__turn_mmu_on_loc:

	.long	.

	.long	.

	.long	__enable_mmu

	.long	__turn_mmu_on

	.long	__enable_mmu_end

	.long	__turn_mmu_on_end





#if defined(CONFIG_SMP)

#if defined(CONFIG_SMP)

	__CPUINIT

	__CPUINIT
@@ -405,7 +405,7 @@ __turn_mmu_on: 
	mov	r3, r3

	mov	r3, r3

	mov	r3, r13

	mov	r3, r13

	mov	pc, r3

	mov	pc, r3

__enable_mmu_end:

__turn_mmu_on_end:

ENDPROC(__turn_mmu_on)

ENDPROC(__turn_mmu_on)