diff mbox

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

Message ID 1454105474-3009-1-git-send-email-chris.brandt@renesas.com (mailing list archive)
State New, archived
Headers show

Commit Message

Chris Brandt Jan. 29, 2016, 10:11 p.m. UTC 
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.

Written by Nicolas Pitre

Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Nicolas Pitre <nico@linaro.org>
---
 arch/arm/include/asm/memory.h | 8 ++++++++
 arch/arm/mm/proc-v7.S         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

Comments

Arnd Bergmann Jan. 31, 2016, 11:20 p.m. UTC | #1 
On Friday 29 January 2016 17:11:14 Chris Brandt wrote:
> 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.
> 
> Written by Nicolas Pitre
> 
> Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
> Signed-off-by: Nicolas Pitre <nico@linaro.org>
> 

I have not verified the contents of the patch, but have two comments on the
submission form:

- replace the 'Written by Nicolas Pitre' sentence with a 'From: Nicolas
  Pitre <nico@linaro.org>' line as the first line of the changelog text,
  followed by an empty line, so that 'git am' can set the correct author
  field.

- put your Signed-off-by: line after Nico's for correct documentation
  of who sent what.

	Arnd
Chris Brandt Feb. 1, 2016, 2:08 p.m. UTC | #2 
> I have not verified the contents of the patch, but have two comments on the submission form:
>
> - replace the 'Written by Nicolas Pitre' sentence with a 'From: Nicolas
>   Pitre <nico@linaro.org>' line as the first line of the changelog text,
>   followed by an empty line, so that 'git am' can set the correct author
>   field.
>
> - put your Signed-off-by: line after Nico's for correct documentation
>   of who sent what.
>
>	Arnd


OK, thank you. That makes more sense.


Chris
diff mbox

Patch

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index c79b57b..7dd2ab5 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -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__
 
 /*
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 0f92d57..1595fb2 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -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