Merge tag 'efi-2020-01-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / include / initcall.h

diff --git a/include/initcall.h b/include/initcall.h
index 2378077361dae9a1bf0e238882438ec25ce288ee..b5acdd01bdb4cf0a3e45e583ad74ff7ceef8295d 100644 (file)
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -1,9 +1,51 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (c) 2011 The Chromium OS Authors.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#ifndef __INITCALL_H
+#define __INITCALL_H
+
 typedef int (*init_fnc_t)(void);
 
-int initcall_run_list(init_fnc_t init_sequence[]);
+/*
+ * To enable debugging. add #define DEBUG at the top of the including file.
+ *
+ * To find a symbol, use grep on u-boot.map
+ */
+static inline int initcall_run_list(const init_fnc_t init_sequence[])
+{
+       const init_fnc_t *init_fnc_ptr;
+
+       for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
+               unsigned long reloc_ofs = 0;
+               int ret;
+
+               /*
+                * Sandbox is relocated by the OS, so symbols always appear at
+                * the relocated address.
+                */
+               if (IS_ENABLED(CONFIG_SANDBOX) || (gd->flags & GD_FLG_RELOC))
+                       reloc_ofs = gd->reloc_off;
+#ifdef CONFIG_EFI_APP
+               reloc_ofs = (unsigned long)image_base;
+#endif
+               if (reloc_ofs)
+                       debug("initcall: %p (relocated to %p)\n",
+                                       (char *)*init_fnc_ptr - reloc_ofs,
+                                       (char *)*init_fnc_ptr);
+               else
+                       debug("initcall: %p\n", (char *)*init_fnc_ptr - reloc_ofs);
+
+               ret = (*init_fnc_ptr)();
+               if (ret) {
+                       printf("initcall sequence %p failed at call %p (err=%d)\n",
+                              init_sequence,
+                              (char *)*init_fnc_ptr - reloc_ofs, ret);
+                       return -1;
+               }
+       }
+       return 0;
+}
+
+#endif