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

Commit e98ff7f6 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

[ARM] 4224/2: allow XIP kernel to boot again 



Since commit 2552fc27 XIP kernels failed
to boot because (_end - PAGE_OFFSET - 1) is much smaller than the size
of the kernel text and data in the XIP case, causing the kernel not to
be entirely mapped.

Even in the non-XIP case, the use of (_end - PAGE_OFFSET - 1) is wrong
because it produces a too large value if TEXT_OFFSET is larger than 1MB.

Finally the original code was performing one loop too many.

Let's break the loop when the section pointer has passed the last byte
of the kernel instead.

Signed-off-by: default avatarNicolas Pitre <nico@cam.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0ebffe39

arch/arm/kernel/head.S

+13 −12
Original line number Diff line number Diff line
@@ -48,9 +48,11 @@ 
	.endm



#ifdef CONFIG_XIP_KERNEL

#define TEXTADDR  XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)

#define KERNEL_START	XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)

#define KERNEL_END	_edata_loc

#else

#define TEXTADDR  KERNEL_RAM_VADDR

#define KERNEL_START	KERNEL_RAM_VADDR

#define KERNEL_END	_end

#endif



/*
@@ -240,16 +242,15 @@ __create_page_tables: 
	 * Now setup the pagetables for our kernel direct

	 * mapped region.

	 */

	add	r0, r4,  #(TEXTADDR & 0xff000000) >> 18	@ start of kernel

	str	r3, [r0, #(TEXTADDR & 0x00f00000) >> 18]!



	ldr	r6, =(_end - PAGE_OFFSET - 1)	@ r6 = number of sections

	mov	r6, r6, lsr #20			@ needed for kernel minus 1



1:	add	r3, r3, #1 << 20

	str	r3, [r0, #4]!

	subs	r6, r6, #1

	bgt	1b

	add	r0, r4,  #(KERNEL_START & 0xff000000) >> 18

	str	r3, [r0, #(KERNEL_START & 0x00f00000) >> 18]!

	ldr	r6, =(KERNEL_END - 1)

	add	r0, r0, #4

	add	r6, r4, r6, lsr #18

1:	cmp	r0, r6

	add	r3, r3, #1 << 20

	strls	r3, [r0], #4

	bls	1b



	/*

	 * Then map first 1MB of ram in case it contains our boot params.

arch/arm/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ SECTIONS 


		_edata = .;

	}

	_edata_loc = __data_loc + SIZEOF(.data);



	.bss : {

		__bss_start = .;	/* BSS				*/