renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-30 16:13:54 +08:00
Code

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

Browse Source 
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>
This commit is contained in:
Nicolas Pitre 2016-02-02 00:14:53 +01:00 committed by Russell King
parent db57f88e4c
commit d781145549
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/include/asm/memory.h
View File

@ -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__
/*

2
arch/arm/mm/proc-v7.S
View File

@ -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