mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-15 15:53:26 +08:00
7554388c1d
The current ordering always results in func pointing to the next function in the init_sequence. e.g. if fdtdec_setup() fails, ret will be set to the error code, then func will be updated to point to initf_malloc(), only then is ret checked and the loop broken. The end result of this is that the "initcall failed at ..." error will point you to initf_malloc(), when the error actually occured in fdtdec_setup()! This can be quite confusing and result in a lot of time wasted debugging code that has nothing to do with the failure (ask me how I know :P). Adjust the for loop to check ret immediately after the call and break early so that func will correctly reference the failed function. Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
101 lines
2.1 KiB
C
101 lines
2.1 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (c) 2013 The Chromium OS Authors.
|
|
*/
|
|
|
|
#include <efi.h>
|
|
#include <initcall.h>
|
|
#include <log.h>
|
|
#include <relocate.h>
|
|
#include <asm/global_data.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
static ulong calc_reloc_ofs(void)
|
|
{
|
|
#ifdef CONFIG_EFI_APP
|
|
return (ulong)image_base;
|
|
#endif
|
|
/*
|
|
* Sandbox is relocated by the OS, so symbols always appear at
|
|
* the relocated address.
|
|
*/
|
|
if (IS_ENABLED(CONFIG_SANDBOX) || (gd->flags & GD_FLG_RELOC))
|
|
return gd->reloc_off;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* initcall_is_event() - Get the event number for an initcall
|
|
*
|
|
* func: Function pointer to check
|
|
* Return: Event number, if this is an event, else 0
|
|
*/
|
|
static int initcall_is_event(init_fnc_t func)
|
|
{
|
|
ulong val = (ulong)func;
|
|
|
|
if ((val & INITCALL_IS_EVENT) == INITCALL_IS_EVENT)
|
|
return val & INITCALL_EVENT_TYPE;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* To enable debugging. add #define DEBUG at the top of the including file.
|
|
*
|
|
* To find a symbol, use grep on u-boot.map
|
|
*/
|
|
int initcall_run_list(const init_fnc_t init_sequence[])
|
|
{
|
|
ulong reloc_ofs = calc_reloc_ofs();
|
|
const init_fnc_t *ptr;
|
|
enum event_t type;
|
|
init_fnc_t func;
|
|
int ret = 0;
|
|
|
|
for (ptr = init_sequence; func = *ptr, func; ptr++) {
|
|
type = initcall_is_event(func);
|
|
|
|
if (type) {
|
|
if (!CONFIG_IS_ENABLED(EVENT))
|
|
continue;
|
|
debug("initcall: event %d/%s\n", type,
|
|
event_type_name(type));
|
|
} else if (reloc_ofs) {
|
|
debug("initcall: %p (relocated to %p)\n",
|
|
(char *)func - reloc_ofs, (char *)func);
|
|
} else {
|
|
debug("initcall: %p\n", (char *)func - reloc_ofs);
|
|
}
|
|
|
|
ret = type ? event_notify_null(type) : func();
|
|
if (ret)
|
|
break;
|
|
}
|
|
|
|
if (ret) {
|
|
if (CONFIG_IS_ENABLED(EVENT)) {
|
|
char buf[60];
|
|
|
|
/* don't worry about buf size as we are dying here */
|
|
if (type) {
|
|
sprintf(buf, "event %d/%s", type,
|
|
event_type_name(type));
|
|
} else {
|
|
sprintf(buf, "call %p", func);
|
|
}
|
|
|
|
printf("initcall failed at %s (err=%dE)\n", buf, ret);
|
|
} else {
|
|
printf("initcall failed at call %p (err=%d)\n",
|
|
(char *)func - reloc_ofs, ret);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|