Commit d7811455 authored Feb 02, 2016 by Nicolas Pitre Committed by Russell King Feb 16, 2016

ARM: 8512/1: proc-v7.S: Adjust stack address when XIP_KERNEL



When XIP_KERNEL is enabled, the virt to phys address translation for RAM
is not the same as the virt to phys address translation for .text.
The only way to know where physical RAM is located is to use
PLAT_PHYS_OFFSET.
The MACRO will be useful for other places where there is a similar problem.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent db57f88e

arch/arm/include/asm/memory.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,14 @@
		*/
		#define PLAT_PHYS_OFFSET UL(CONFIG_PHYS_OFFSET)

		#ifdef CONFIG_XIP_KERNEL
		#define PHYS_OFFSET_FIXUP \
		( XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR) - PAGE_OFFSET + \
		PLAT_PHYS_OFFSET - CONFIG_XIP_PHYS_ADDR )
		#else
		#define PHYS_OFFSET_FIXUP 0
		#endif

		#ifndef __ASSEMBLY__

		/*

arch/arm/mm/proc-v7.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -487,7 +487,7 @@ __errata_finish:

		.align 2
		__v7_setup_stack_ptr:
		.word __v7_setup_stack - .
		.word __v7_setup_stack - . + PHYS_OFFSET_FIXUP
		ENDPROC(__v7_setup)

		.bss