diff mbox

ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled

Message ID 1366132149-17294-1-git-send-email-swarren@wwwdotorg.org (mailing list archive)
State New, archived
Headers show

Commit Message

Stephen Warren April 16, 2013, 5:09 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

When building the kernel with CONFIG_THUMB2_KERNEL enabled, older
assemblers may emit the following error:

reset-handler.S:78: Error: invalid immediate for address calculation (value = 0x00000004)

Using an explicit adr.w instruction will solve this. Newer assemblers do
this automatically. Use the W() macro to do this under Thumb mode only.

Inspired-by: Joseph Lo <josephl@nvidia.com>
Suggested-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
Olof, Arnd,

Can you please apply this directly to arm-soc. Thanks.

This patch replaces patch 3/3 "ARM: tegra: make sure the pointer on 4
byte align when THUMB2_KERNEL enabled" which I forwarded yesterday. It
can be applied to wherever Tegra's for-3.10/fixes branch was applied,
and doesn't cause any conflicts/merge-issues with any other Tegra patches
this cycle.

 arch/arm/mach-tegra/sleep.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Olof Johansson April 18, 2013, 4:36 p.m. UTC | #1 
On Tue, Apr 16, 2013 at 11:09:09AM -0600, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> When building the kernel with CONFIG_THUMB2_KERNEL enabled, older
> assemblers may emit the following error:
> 
> reset-handler.S:78: Error: invalid immediate for address calculation (value = 0x00000004)
> 
> Using an explicit adr.w instruction will solve this. Newer assemblers do
> this automatically. Use the W() macro to do this under Thumb mode only.
> 
> Inspired-by: Joseph Lo <josephl@nvidia.com>
> Suggested-by: Dave Martin <dave.martin@linaro.org>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> Olof, Arnd,
> 
> Can you please apply this directly to arm-soc. Thanks.
> 
> This patch replaces patch 3/3 "ARM: tegra: make sure the pointer on 4
> byte align when THUMB2_KERNEL enabled" which I forwarded yesterday. It
> can be applied to wherever Tegra's for-3.10/fixes branch was applied,
> and doesn't cause any conflicts/merge-issues with any other Tegra patches
> this cycle.


Applied.


-Olof
diff mbox

Patch

diff --git a/arch/arm/mach-tegra/sleep.h b/arch/arm/mach-tegra/sleep.h
index 4ffae54..bb308ea 100644
--- a/arch/arm/mach-tegra/sleep.h
+++ b/arch/arm/mach-tegra/sleep.h
@@ -92,7 +92,7 @@ 
 
 #ifdef CONFIG_CACHE_L2X0
 .macro l2_cache_resume, tmp1, tmp2, tmp3, phys_l2x0_saved_regs
-	adr	\tmp1, \phys_l2x0_saved_regs
+	W(adr)	\tmp1, \phys_l2x0_saved_regs
 	ldr	\tmp1, [\tmp1]
 	ldr	\tmp2, [\tmp1, #L2X0_R_PHY_BASE]
 	ldr	\tmp3, [\tmp2, #L2X0_CTRL]