Revert "initcall: Move to inline function"

Somehow I do not see any inlining with initcalls now. I was sure I saw
it when this commit went in, but now it seems to make things worse.

This reverts commit 47870afab92fca6e672c03d0dea802a55e200675.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/board_r.c b/common/board_r.c
index 598155c7753d2efb3ae1ddac6608ec003fa5d92a..85860861f0ac4f06d01feaec73367fb23ba8daac 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -583,7 +583,10 @@ static int run_main_loop(void)
 }
 
 /*
- * We hope to remove most of the driver-related init and do it if/when
+ * Over time we hope to remove these functions with code fragments and
+ * stub functions, and instead call the relevant function directly.
+ *
+ * We also hope to remove most of the driver-related init and do it if/when
  * the driver is later used.
  *
  * TODO: perhaps reset the watchdog in the initcall function after each call?

diff --git a/include/initcall.h b/include/initcall.h
index 69ce268070510a398a847ed977486dfefd70646f..01f3f2833f10291429049ec346b407d405b97954 100644 (file)
--- a/include/initcall.h
+++ b/include/initcall.h
@@ -8,50 +8,6 @@
 
 typedef int (*init_fnc_t)(void);
 
-#include <log.h>
-#ifdef CONFIG_EFI_APP
-#include <efi.h>
-#endif
-#include <asm/global_data.h>
-
-/*
- * 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;
-}
+int initcall_run_list(const init_fnc_t init_sequence[]);
 
 #endif

diff --git a/lib/Makefile b/lib/Makefile
index 8d8ccc8bbc39578cc2c94559e6fd74ff027e622a..839872d804b5fde7fff4ab9a5fcf5cd0b25fd789 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_GZIP_COMPRESSED) += gzip.o
 obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o
 obj-$(CONFIG_SMBIOS_PARSER) += smbios-parser.o
 obj-$(CONFIG_IMAGE_SPARSE) += image-sparse.o
+obj-y += initcall.o
 obj-y += ldiv.o
 obj-$(CONFIG_XXHASH) += xxhash.o
 obj-y += net_utils.o

diff --git a/lib/initcall.c b/lib/initcall.c
new file mode 100644 (file)
index 0000000..eedb0fb
--- /dev/null
+++ b/lib/initcall.c
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2013 The Chromium OS Authors.
+ */
+
+#include <common.h>
+#include <efi.h>
+#include <initcall.h>
+#include <log.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * 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[])
+{
+       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;
+}