From fb92308b983d54f6275ae0ced0e6930dfcc5bdec Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 16 Jan 2017 07:03:51 -0700 Subject: [PATCH] x86: board_r: Set the global data pointer after relocation Since 'gd' is just a normal variable on 64-bit x86, it is relocated by the time we get to board_init_r(). The old 'gd' variable is passed in as parameter to board_init_r(), presumably for this situation. Assign it on 64-bit x86 so that gd points to the correct data. Options to improve this: - Make gd a fixed register and remove the board_init_r() parameter - Make all archs use this board_init_r() parameter The second has a TODO in the code. The first has a TODO in a future commit ('x86: Support global_data on x86_64') Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- common/board_r.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/board_r.c b/common/board_r.c index f739c8afdf..8077280de4 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -947,6 +947,16 @@ static init_fnc_t init_sequence_r[] = { void board_init_r(gd_t *new_gd, ulong dest_addr) { + /* + * Set up the new global data pointer. So far only x86 does this + * here. + * TODO(sjg@chromium.org): Consider doing this for all archs, or + * dropping the new_gd parameter. + */ +#if CONFIG_IS_ENABLED(X86_64) + arch_setup_gd(new_gd); +#endif + #ifdef CONFIG_NEEDS_MANUAL_RELOC int i; #endif -- 2.25.1