Patchwork [U-Boot] powerpc/lib/board.c: Call run_post(POST_ROM) before relocating

login
register
mail settings
Submitter Bernhard Kaindl
Date Oct. 16, 2011, 10:07 a.m.
Message ID <1318759628-10668-1-git-send-email-bernhard.kaindl@gmx.net>
Download mbox | patch
Permalink /patch/120022/
State Accepted
Commit 9d256b67f6978c934e737e42245c150e8837fafb
Headers show

Comments

Bernhard Kaindl - Oct. 16, 2011, 10:07 a.m.
From: Bernhard Kaindl <bernhard.kaindl@thalesgroup.com>

The call to run_post(POST_ROM) which can run the POST memory test
is currently called too late when gd has already been copied to DRAM.

This results in failure to boot Linux after a POST_ROM memory test
tested all RAM while gd was already relocated to DRAM due to gd being
overwritten by the POST_ROM memory test.

Support this by moving the call to run_post(POST_ROM) to run earlier,
before U-Boot has started to move data to DRAM (from late board_init_f
to early board_init_f) where DRAM is initialized, but not used yet.

This allows that an POST memory test can test the whole DRAM,
including the area where the board info struct is located.

Signed-off-by: Bernhard Kaindl <bernhard.kaindl@thalesgroup.com>
Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
---
 arch/powerpc/lib/board.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
Wolfgang Denk - Oct. 23, 2011, 8:58 p.m.
Dear Bernhard Kaindl,

In message <1318759628-10668-1-git-send-email-bernhard.kaindl@gmx.net> you wrote:
> From: Bernhard Kaindl <bernhard.kaindl@thalesgroup.com>
> 
> The call to run_post(POST_ROM) which can run the POST memory test
> is currently called too late when gd has already been copied to DRAM.
> 
> This results in failure to boot Linux after a POST_ROM memory test
> tested all RAM while gd was already relocated to DRAM due to gd being
> overwritten by the POST_ROM memory test.
> 
> Support this by moving the call to run_post(POST_ROM) to run earlier,
> before U-Boot has started to move data to DRAM (from late board_init_f
> to early board_init_f) where DRAM is initialized, but not used yet.
> 
> This allows that an POST memory test can test the whole DRAM,
> including the area where the board info struct is located.
> 
> Signed-off-by: Bernhard Kaindl <bernhard.kaindl@thalesgroup.com>
> Cc: Pieter Voorthuijsen <pieter.voorthuijsen@prodrive.nl>
> ---
>  arch/powerpc/lib/board.c |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 4fd0149..f9c9dea 100644
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -397,6 +397,13 @@  void board_init_f (ulong bootflag)
 		}
 	}
 
+#ifdef CONFIG_POST
+	post_bootmode_init();
+	post_run(NULL, POST_ROM | post_bootmode_get(0));
+#endif
+
+	WATCHDOG_RESET();
+
 	/*
 	 * Now that we have DRAM mapped and working, we can
 	 * relocate the code and continue running from DRAM.
@@ -604,13 +611,6 @@  void board_init_f (ulong bootflag)
 
 	WATCHDOG_RESET ();
 
-#ifdef CONFIG_POST
-	post_bootmode_init();
-	post_run (NULL, POST_ROM | post_bootmode_get(0));
-#endif
-
-	WATCHDOG_RESET();
-
 	gd->relocaddr = addr; /* Record relocation address, useful for debug */
 
 	memcpy (id, (void *)gd, sizeof (gd_t));