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

Commit 5b526bd9 authored by Jean-Philippe Brucker's avatar Jean-Philippe Brucker Committed by Russell King
Browse files

ARM: 8572/1: nommu: change memory reserve for the vectors 



Commit 19accfd3 (ARM: move vector stubs) moved the vector stubs in an
additional page above the base vector one. This change wasn't taken into
account by the nommu memreserve.
This patch ensures that the kernel won't overwrite any vector stub on
nommu.

[changed the MPU side too]

Signed-off-by: default avatarJean-Philippe Brucker <jean-philippe.brucker@arm.com>
Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 695665b0

arch/arm/kernel/head-nommu.S

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ ENTRY(__setup_mpu) 
	mov	r0, #CONFIG_VECTORS_BASE	@ Cover from VECTORS_BASE

	ldr	r5,=(MPU_AP_PL1RW_PL0NA | MPU_RGN_NORMAL)

	/* Writing N to bits 5:1 (RSR_SZ) --> region size 2^N+1 */

	mov	r6, #(((PAGE_SHIFT - 1) << MPU_RSR_SZ) | 1 << MPU_RSR_EN)

	mov	r6, #(((2 * PAGE_SHIFT - 1) << MPU_RSR_SZ) | 1 << MPU_RSR_EN)



	setup_region r0, r5, r6, MPU_DATA_SIDE	@ VECTORS_BASE, PL0 NA, enabled

	beq	3f				@ Memory-map not unified

arch/arm/mm/nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ void __init arm_mm_memblock_reserve(void) 
	 * some architectures which the DRAM is the exception vector to trap,

	 * alloc_page breaks with error, although it is not NULL, but "0."

	 */

	memblock_reserve(CONFIG_VECTORS_BASE, PAGE_SIZE);

	memblock_reserve(CONFIG_VECTORS_BASE, 2 * PAGE_SIZE);

#else /* ifndef CONFIG_CPU_V7M */

	/*

	 * There is no dedicated vector page on V7-M. So nothing needs to be