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

Commit 4052ebb7 authored by George G. Davis's avatar George G. Davis Committed by Russell King
Browse files

[ARM] 3859/1: Fix devicemaps_init() XIP_KERNEL odd 1MiB XIP_PHYS_ADDR translation error 



The ARM XIP_KERNEL map created in devicemaps_init() is wrong.
The map.pfn is rounded down to an even 1MiB section boundary
which results in va/pa translations errors when XIP_PHYS_ADDR
starts on an odd 1MiB boundary and this causes the kernel to
hang.  This patch fixes ARM XIP_KERNEL translation errors for
the odd 1MiB XIP_PHYS_ADDR boundary case.

Signed-off-by: default avatarGeorge G. Davis <gdavis@mvista.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4b053e7a

arch/arm/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -434,9 +434,9 @@ static void __init devicemaps_init(struct machine_desc *mdesc) 
	 * It is always first in the modulearea.

	 */

#ifdef CONFIG_XIP_KERNEL

	map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & PGDIR_MASK);

	map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);

	map.virtual = MODULE_START;

	map.length = ((unsigned long)&_etext - map.virtual + ~PGDIR_MASK) & PGDIR_MASK;

	map.length = ((unsigned long)&_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;

	map.type = MT_ROM;

	create_mapping(&map);

#endif

include/asm-arm/pgtable.h

+7 −0
Original line number Diff line number Diff line
@@ -135,6 +135,13 @@ extern void __pgd_error(const char *file, int line, unsigned long val); 
#define FIRST_USER_PGD_NR	1

#define USER_PTRS_PER_PGD	((TASK_SIZE/PGDIR_SIZE) - FIRST_USER_PGD_NR)



/*

 * section address mask and size definitions.

 */

#define SECTION_SHIFT		20

#define SECTION_SIZE		(1UL << SECTION_SHIFT)

#define SECTION_MASK		(~(SECTION_SIZE-1))



/*

 * ARMv6 supersection address mask and size definitions.

 */