Skip to contentSkip to conversation

armv7: do not relocate _start twice

PATCH New Vincent Stehlé 2 participants 2 messages Mar 15, 2013 – Mar 28, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 armv7: do not relocate _start twice

The _start symbol is already relocated, so do not add the relocation the second time in c_runtime_cpu_setup.

This fixes e.g. the abort exception handling path, which ended in double fault due to bad address in VBAR.

---

Hello,

Here is a fix for a bug reported by Lubomir. He noticed that exceptions were not handled correctly anymore. This can be seen with e.g. the 'dhcp' command on some OMAP platforms.

Looking at the code, I would says the fix applies to all armv7 platforms except Tegra but I did only test on OMAP5. On this platform at least the abort is now handled:

OMAP5430 EVM # dhcp
data abort

MAYBE you should read doc/README.arm-unaligned-accesses

  pc : [<fef9bd78>]          lr : [<fefa1790>]
  sp : feef9dc4  ip : fefed0f8     fp : 00000000
  r10: 00000001  r9 : 00000001     r8 : feef9f48
  r7 : feef9fe0  r6 : 00000000     r5 : 00000000  r4 : 00000014
  r3 : 00000000  r2 : 00000002     r1 : 00000014  r0 : fefed0f4
  Flags: Nzcv  IRQs off  FIQs off  Mode SVC_32
  Resetting CPU ...

resetting ...

It would be appreciated if folks could verify on other ARMv7 platforms, when running from flash for example (where relocation may differ?)

 arch/arm/cpu/armv7/start.S |    1 -
 1 file changed, 1 deletion(-)
arch/arm/cpu/armv7/start.S +0 -1
index 6b59529d..d06b35f 100644
@@ -254,7 +254,6 @@ ENTRY(c_runtime_cpu_setup)
 #if !defined(CONFIG_TEGRA)
 	/* Set vector address in CP15 VBAR register */
 	ldr     r0, =_start
-	add     r0, r0, r9
 	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
 #endif /* !Tegra */
 
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 armv7: do not relocate _start twice

Hi Vincent,

Quoted 48 lines · Vincent Stehl?

The _start symbol is already relocated, so do not add the relocation the second time in c_runtime_cpu_setup.

This fixes e.g. the abort exception handling path, which ended in double fault due to bad address in VBAR.

---

Hello,

Here is a fix for a bug reported by Lubomir. He noticed that exceptions were not handled correctly anymore. This can be seen with e.g. the 'dhcp' command on some OMAP platforms.

Looking at the code, I would says the fix applies to all armv7 platforms except Tegra but I did only test on OMAP5. On this platform at least the abort is now handled:

OMAP5430 EVM # dhcp
data abort

MAYBE you should read doc/README.arm-unaligned-accesses

  pc : [<fef9bd78>]          lr : [<fefa1790>]
  sp : feef9dc4  ip : fefed0f8     fp : 00000000
  r10: 00000001  r9 : 00000001     r8 : feef9f48
  r7 : feef9fe0  r6 : 00000000     r5 : 00000000  r4 : 00000014
  r3 : 00000000  r2 : 00000002     r1 : 00000014  r0 : fefed0f4
  Flags: Nzcv  IRQs off  FIQs off  Mode SVC_32
  Resetting CPU ...

resetting ...

It would be appreciated if folks could verify on other ARMv7 platforms, when running from flash for example (where relocation may differ?)

 arch/arm/cpu/armv7/start.S |    1 -
 1 file changed, 1 deletion(-)
arch/arm/cpu/armv7/start.S +0 -0
index 6b59529d..d06b35f 100644

arch/arm/cpu/armv7/start.S ENTRY(c_runtime_cpu_setup) · line 258

Quoted 6 lines
arch/arm/cpu/armv7/start.S +0 -1
@@ -254,7 +254,6 @@ ENTRY(c_runtime_cpu_setup)
 #if !defined(CONFIG_TEGRA)
 	/* Set vector address in CP15 VBAR register */
 	ldr     r0, =_start
-	add     r0, r0, r9
 	mcr     p15, 0, r0, c12, c0, 0  @Set VBAR
 #endif /* !Tegra */

That's a very good catch!

For the record, the issue crept in when I applied the patch set to remove all R_ARM_ABS32 relocation record types; after that, the only manual relocations that should have remained were the three ones in each relocate_code() routine, yet in armv7 there was this fourth one which had totally escaped my attention.

I have verified in the ELF dump of omap5_evm that the "=_start" reference is indeed relocated as part of relocate_code() execution.

As this is a bugfix, applied to u-boot-arm/master,

thanks!

Amicalement,

Signature · 1 line
Albert.