Skip to contentSkip to conversation

ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled

PATCH New Stephen Warren 2 participants 2 messages Apr 16, 2013 – Apr 18, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled

From: Stephen Warren <[email protected]>

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.

---
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(-)
arch/arm/mach-tegra/sleep.h +1 -1
index 4ffae54..bb308ea 100644
@@ -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]
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 ARM: tegra: solve adr range issue with THUMB2_KERNEL enabled

Quoted 16 lines · Stephen Warren

From: Stephen Warren <[email protected]>

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.

---
Olof, Arnd,

Quoted 7 lines

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