arm: Make reset position-independent
PATCH 1/2 arm: Make reset position-independent
Some boards, like mx31pdk and tx25, require the beginning of the SPL code to be position-independent. For these two boards, this is because they use the i.MX external NAND boot, which starts by executing the first NAND Flash page from the NFC page buffer. The SPL then needs to copy itself to its actual link address in order to free the NFC page buffer and use it to load the non-SPL image from Flash before running it. This means that the SPL runtime address differs from its link address between the reset and the initial copy performed by board_init_f(), so this part of the SPL binary must be position-independent.
This requirement was broken by commit 41623c9 'arm: move exception handling out of start.S files', which used an absolute address to branch to the reset routine. This new commit restores the original behavior, which just performed a relative branch. This fixes the boot of mx31pdk and tx25.
--- arch/arm/lib/vectors.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/lib/vectors.S +1 -2
@@ -50,7 +50,7 @@ #endif _start: - ldr pc, _reset + b reset ldr pc, _undefined_instruction ldr pc, _software_interrupt ldr pc, _prefetch_abort
@@ -77,7 +77,6 @@ _start: .globl _irq .globl _fiq -_reset: .word reset _undefined_instruction: .word undefined_instruction _software_interrupt: .word software_interrupt _prefetch_abort: .word prefetch_abort
Signature · 1 line
1.7.10.4
PATCH 1/2 arm: Make reset position-independent
Quoted 48 lines · Beno?t Th?baudeau
Some boards, like mx31pdk and tx25, require the beginning of the SPL code to be position-independent. For these two boards, this is because they use the i.MX external NAND boot, which starts by executing the first NAND Flash page from the NFC page buffer. The SPL then needs to copy itself to its actual link address in order to free the NFC page buffer and use it to load the non-SPL image from Flash before running it. This means that the SPL runtime address differs from its link address between the reset and the initial copy performed by
board_init_f(), so this part of the SPL binary must be position-independent.This requirement was broken by commit 41623c9 'arm: move exception handling out of
start.Sfiles', which used an absolute address to branch to the reset routine. This new commit restores the original behavior, which just performed a relative branch. This fixes the boot of mx31pdk and tx25.Signed-off-by Beno?t Th?baudeau <[email protected]>Reported-by Helmut Raiger <[email protected]>Cc Albert Aribaud <[email protected]>Cc Magnus Lilja <[email protected]>Cc John Rigby <[email protected]>--- arch/arm/lib/vectors.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/arm/lib/vectors.S +1
-3@@ -50,7 +50,7 @@ #endif _start: - ldr pc, _reset + b reset ldr pc, _undefined_instruction ldr pc, _software_interrupt ldr pc, _prefetch_abort@@ -77,7 +77,6 @@ _start: .globl _irq .globl _fiq -_reset: .word reset _undefined_instruction: .word undefined_instruction _software_interrupt: .word software_interrupt _prefetch_abort: .word prefetch_abort --
Quoted 2 lines
1.7.10.4
Magnus, can I have your 'Tested-by' for mx31pdk since you said you have tested this?
Tom, Albert, can you build-test all ARM boards with this patch (that would take eons on my ultra slow machine)? It would also be nice if someone could runtime-test an ARM board other than mx31pdk and tx25 with this patch.
Thanks in advance.
Best regards,
Beno?t
PATCH 1/2 arm: Make reset position-independent
In reply to Benoît ThébaudeauQuoted 48 lines · Beno?t Th?baudeau
Some boards, like mx31pdk and tx25, require the beginning of the SPL code to be position-independent. For these two boards, this is because they use the i.MX external NAND boot, which starts by executing the first NAND Flash page from the NFC page buffer. The SPL then needs to copy itself to its actual link address in order to free the NFC page buffer and use it to load the non-SPL image from Flash before running it. This means that the SPL runtime address differs from its link address between the reset and the initial copy performed by
board_init_f(), so this part of the SPL binary must be position-independent.This requirement was broken by commit 41623c9 'arm: move exception handling out of
start.Sfiles', which used an absolute address to branch to the reset routine. This new commit restores the original behavior, which just performed a relative branch. This fixes the boot of mx31pdk and tx25.Signed-off-by Beno?t Th?baudeau <[email protected]>Reported-by Helmut Raiger <[email protected]>Cc Albert Aribaud <[email protected]>Cc Magnus Lilja <[email protected]>Cc John Rigby <[email protected]>--- arch/arm/lib/vectors.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/arm/lib/vectors.S +1
-3@@ -50,7 +50,7 @@ #endif _start: - ldr pc, _reset + b reset ldr pc, _undefined_instruction ldr pc, _software_interrupt ldr pc, _prefetch_abort@@ -77,7 +77,6 @@ _start: .globl _irq .globl _fiq -_reset: .word reset _undefined_instruction: .word undefined_instruction _software_interrupt: .word software_interrupt _prefetch_abort: .word prefetch_abort --
Quoted 2 lines
1.7.10.4
Adding Helmut to Cc.
Beno?t
PATCH 2/2 arm: Fix _start for CONFIG_SYS_DV_NOR_BOOT_CFG
In reply to Benoît ThébaudeauThe boards using CONFIG_SYS_DV_NOR_BOOT_CFG (i.e. calimain, da850evm_direct_nor and enbw_cmc) had the _start symbol defined after the CONFIG_SYS_DV_NOR_BOOT_CFG word rather than before it in arch/arm/lib/vectors.S. Because of that, if by lack of luck 'gd->mon_len = (ulong)&__bss_end - (ulong)_start' (see setup_mon_len()) was a multiple of 4 kiB (see reserve_uboot()), then the last BSS word overlapped the first word of the following reserved RAM area (or went beyond the top of RAM without such an area) after relocation because __image_copy_start did not match _start (see relocate_code()).
This was broken by commit 41623c9 'arm: move exception handling out of start.S files', which defined _start twice (before and after the CONFIG_SYS_DV_NOR_BOOT_CFG word), then by commit 0a26e1d 'arm: fix a double-definition error of _start symbol', which kept the definition of the _start symbol after the CONFIG_SYS_DV_NOR_BOOT_CFG word. This new commit fixes this issue by restoring the original behavior, i.e. by defining the _start symbol before the CONFIG_SYS_DV_NOR_BOOT_CFG word.
--- arch/arm/lib/vectors.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/lib/vectors.S +2 -1
@@ -45,11 +45,12 @@ ************************************************************************* */ +_start: + #ifdef CONFIG_SYS_DV_NOR_BOOT_CFG .word CONFIG_SYS_DV_NOR_BOOT_CFG #endif -_start: b reset ldr pc, _undefined_instruction ldr pc, _software_interrupt
Signature · 1 line
1.7.10.4
PATCH 2/2 arm: Fix _start for CONFIG_SYS_DV_NOR_BOOT_CFG
Hi Beno?t,
Quoted 36 lines · Beno?t Th?baudeau
The boards using
CONFIG_SYS_DV_NOR_BOOT_CFG(i.e. calimain,da850evm_direct_norandenbw_cmc) had the_startsymbol defined after theCONFIG_SYS_DV_NOR_BOOT_CFGword rather than before it inarch/arm/lib/vectors.S. Because of that, if by lack of luck 'gd->mon_len= (ulong)&__bss_end - (ulong)_start' (seesetup_mon_len()) was a multiple of 4 kiB (seereserve_uboot()), then the last BSS word overlapped the first word of the following reserved RAM area (or went beyond the top of RAM without such an area) after relocation because__image_copy_startdid not match_start(seerelocate_code()).This was broken by commit 41623c9 'arm: move exception handling out of
start.Sfiles', which defined_starttwice (before and after theCONFIG_SYS_DV_NOR_BOOT_CFGword), then by commit 0a26e1d 'arm: fix a double-definition error of_startsymbol', which kept the definition of the_startsymbol after theCONFIG_SYS_DV_NOR_BOOT_CFGword. This new commit fixes this issue by restoring the original behavior, i.e. by defining the_startsymbol before theCONFIG_SYS_DV_NOR_BOOT_CFGword.Signed-off-by Beno?t Th?baudeau <[email protected]>Cc Albert Aribaud <[email protected]>Cc Manfred Rudigier <[email protected]>Cc Christian Riesch <[email protected]>Cc Sudhakar Rajashekhara <[email protected]>Cc Heiko Schocher <[email protected]>--- arch/arm/lib/vectors.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/lib/vectors.S +0
-0@@ -45,11 +45,12 @@ ************************************************************************* */
arch/arm/lib/vectors.S line 56
Quoted 10 lines
arch/arm/lib/vectors.S +2
-1+_start: + #ifdef CONFIG_SYS_DV_NOR_BOOT_CFG .word CONFIG_SYS_DV_NOR_BOOT_CFG #endif -_start: b reset ldr pc, _undefined_instruction ldr pc, _software_interrupt
Applied (as a bug fix) to u-boot-arm/master, thanks!
Amicalement,
Signature · 1 line
Albert.
PATCH 1/2 arm: Make reset position-independent
In reply to Benoît ThébaudeauHi
Quoted 17 lines · Beno?t Th?baudeau
Some boards, like mx31pdk and tx25, require the beginning of the SPL code to be position-independent. For these two boards, this is because they use the i.MX external NAND boot, which starts by executing the first NAND Flash page from the NFC page buffer. The SPL then needs to copy itself to its actual link address in order to free the NFC page buffer and use it to load the non-SPL image from Flash before running it. This means that the SPL runtime address differs from its link address between the reset and the initial copy performed by
board_init_f(), so this part of the SPL binary must be position-independent.This requirement was broken by commit 41623c9 'arm: move exception handling out of
start.Sfiles', which used an absolute address to branch to the reset routine. This new commit restores the original behavior, which just performed a relative branch. This fixes the boot of mx31pdk and tx25.
Quoted 6 lines
Signed-off-by Beno?t Th?baudeau <[email protected]>Reported-by Helmut Raiger <[email protected]>Cc Albert Aribaud <[email protected]>Cc Magnus Lilja <[email protected]>Cc John Rigby <[email protected]>---
PATCH 1/2 arm: Make reset position-independent
Hi Albert,
Quoted 21 lines · Magnus Lilja
Hi
Quoted 17 lines · Beno?t Th?baudeau
Some boards, like mx31pdk and tx25, require the beginning of the SPL code to be position-independent. For these two boards, this is because they use the i.MX external NAND boot, which starts by executing the first NAND Flash page from the NFC page buffer. The SPL then needs to copy itself to its actual link address in order to free the NFC page buffer and use it to load the non-SPL image from Flash before running it. This means that the SPL runtime address differs from its link address between the reset and the initial copy performed by
board_init_f(), so this part of the SPL binary must be position-independent.This requirement was broken by commit 41623c9 'arm: move exception handling out of
start.Sfiles', which used an absolute address to branch to the reset routine. This new commit restores the original behavior, which just performed a relative branch. This fixes the boot of mx31pdk and tx25.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Beno?t Th?baudeau <[email protected]>Reported-by Helmut Raiger <[email protected]>Cc Albert Aribaud <[email protected]>Cc Magnus Lilja <[email protected]>Cc John Rigby <[email protected]>---
Tested-by Magnus Lilja <[email protected]>
Should this one go through your tree?
PATCH 1/2 arm: Make reset position-independent
In reply to Benoît ThébaudeauHi Beno?t,
Quoted 40 lines · Beno?t Th?baudeau
Some boards, like mx31pdk and tx25, require the beginning of the SPL code to be position-independent. For these two boards, this is because they use the i.MX external NAND boot, which starts by executing the first NAND Flash page from the NFC page buffer. The SPL then needs to copy itself to its actual link address in order to free the NFC page buffer and use it to load the non-SPL image from Flash before running it. This means that the SPL runtime address differs from its link address between the reset and the initial copy performed by
board_init_f(), so this part of the SPL binary must be position-independent.This requirement was broken by commit 41623c9 'arm: move exception handling out of
start.Sfiles', which used an absolute address to branch to the reset routine. This new commit restores the original behavior, which just performed a relative branch. This fixes the boot of mx31pdk and tx25.Signed-off-by Beno?t Th?baudeau <[email protected]>Reported-by Helmut Raiger <[email protected]>Cc Albert Aribaud <[email protected]>Cc Magnus Lilja <[email protected]>Cc John Rigby <[email protected]>--- arch/arm/lib/vectors.S | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/arm/lib/vectors.S +1
-1@@ -50,7 +50,7 @@ #endif _start: - ldr pc, _reset + b reset ldr pc, _undefined_instruction ldr pc, _software_interrupt ldr pc, _prefetch_abort
arch/arm/lib/vectors.S _start: · line 82
Quoted 7 lines
arch/arm/lib/vectors.S +0
-1@@ -77,7 +77,6 @@ _start: .globl _irq .globl _fiq -_reset: .word reset _undefined_instruction: .word undefined_instruction _software_interrupt: .word software_interrupt _prefetch_abort: .word prefetch_abort
Applied (as a bug fix) to u-boot-arm/master, thanks!
Amicalement,
Signature · 1 line
Albert.