From e7595aa350ae61e3dfefbde8fe3af01c12b65ccf Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 15 Jul 2023 21:39:05 -0600 Subject: [PATCH] x86: Allow logging to be used in SPL reliably When global_data is relocated, log_head moves in memory, meaning that the items in that list point to the wrong place. Disable logging when making the change, then reenable it afterwards, so that logging works normally. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/lib/spl.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index 039f219f50..92a5e6aec7 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -144,9 +144,22 @@ static int x86_spl_init(void) */ gd->new_gd = (struct global_data *)ptr; memcpy(gd->new_gd, gd, sizeof(*gd)); + + /* + * Make sure logging is disabled when we switch, since the log system + * list head will move + */ + gd->new_gd->flags &= ~GD_FLG_LOG_READY; arch_setup_gd(gd->new_gd); gd->start_addr_sp = (ulong)ptr; + /* start up logging again, with the new list-head location */ + ret = log_init(); + if (ret) { + log_debug("Log setup failed (err=%d)\n", ret); + return ret; + } + if (_LOG_DEBUG) { ret = mtrr_list(mtrr_get_var_count(), MP_SELECT_BSP); if (ret) -- 2.39.5