Static initcalls
Subsystems (2)
v3 cover Static initcalls
This series replaces the dynamic initcalls (with function pointers) with static calls, and gets rid of initcall_run_list(), init_sequence_f, init_sequence_f_r and init_sequence_r. This makes the code simpler and the binary slighlty smaller: -2217 bytes/-0.21 % with LTO enabled and -510 bytes/-0.05 % with LTO disabled (xilinx_zynqmp_kria_defconfig).
Execution time doesn't seem to change noticeably. There is no impact on the SPL.
Changes in v3:
- Use printf() rather than debug() to report initcall failures (Quentin S.)
- initcall_run_f(): replace one erroneous call to WATCHDOG_INIT() with WATCHDOG_RESET() (Ilias A.)
- Fix relocate_code() in arch/sh/lib/board.c to address CI failures with r2dplus (https://lists.denx.de/pipermail/u-boot/2025-January/576213.html)
(Tom R.)
- Add comments to initcall_run_f() and initcall_run_r() (Simon G.)
Changes in v2:
- INTICALL() and INITCALL_EVT() now call hang() immediately on error
- Fixed typo: s/intcall_run_f_r/initcall_run_f_r/
Jerome Forissier (4):
board_init_f(): use static calls
board_init_f_r(): use static calls
board_init_r(): use static calls
initcall: remove initcall_run_list()
Michal Simek (1):
common: board: Simplify array with function pointers with
CONFIG_IS_ENABLED
arch/sh/lib/board.c | 9 +- common/board_f.c | 214 ++++++++++++++----------------- common/board_r.c | 245 ++++++++++++++---------------------- include/initcall.h | 45 +++---- lib/Makefile | 1 - lib/initcall.c | 102 --------------- test/py/tests/test_trace.py | 8 +- 7 files changed, 220 insertions(+), 404 deletions(-) delete mode 100644 lib/initcall.c
Signature · 1 line
2.43.0
PATCH v3 1/5 common: board: Simplify array with function pointers with CONFIG_IS_ENABLED
From: Michal Simek <[email protected]>
Convert all simple cases where current ifdef is used with using CONFIG_IS_ENABLED.
The change doesn't have impact on code size and it is only cleaning up description.
Checkpatch is reporting issue:
space required after that ',' (ctx:VxB)
When space is there another warning is coming up:
space prohibited before that close parenthesis ')'
but there is no way how to fix it that's why leave it like it is.
--- common/board_f.c | 49 +++++------------- common/board_r.c | 128 ++++++++++++----------------------------------- 2 files changed, 46 insertions(+), 131 deletions(-)
common/board_f.c +13 -36
@@ -872,12 +872,8 @@ static int initf_upl(void)static const init_fnc_t init_sequence_f[] = { setup_mon_len, -#ifdef CONFIG_OF_CONTROL - fdtdec_setup, -#endif -#ifdef CONFIG_TRACE_EARLY - trace_early_init, -#endif + CONFIG_IS_ENABLED(OF_CONTROL, (fdtdec_setup,)) + CONFIG_IS_ENABLED(TRACE_EARLY, (trace_early_init,)) initf_malloc, initf_upl, log_init,
@@ -885,16 +881,12 @@ static const init_fnc_t init_sequence_f[] = { event_init, bloblist_maybe_init, setup_spl_handoff, -#if defined(CONFIG_CONSOLE_RECORD_INIT_F) - console_record_init, -#endif + CONFIG_IS_ENABLED(CONSOLE_RECORD_INIT_F, (console_record_init,))INITCALL_EVENT (EVT_FSP_INIT_F ), arch_cpu_init,/* basic arch cpu dependent setup */ mach_cpu_init,/* SoC/machine dependent CPU setup */ initf_dm, -#if defined(CONFIG_BOARD_EARLY_INIT_F) - board_early_init_f, -#endif + CONFIG_IS_ENABLED(BOARD_EARLY_INIT_F, (board_early_init_f,))#if defined(CONFIG_PPC ) || defined(CONFIG_SYS_FSL_CLK ) || defined(CONFIG_M68K )/* get CPU and bus clocks according to the environment variable */ get_clocks, /* get CPU and bus clocks (etc.) */
@@ -902,9 +894,7 @@ static const init_fnc_t init_sequence_f[] = {#if !defined(CONFIG_M68K ) || (defined(CONFIG_M68K ) && !defined(CONFIG_MCFTMR )) timer_init,/* initialize timer */ #endif -#if defined(CONFIG_BOARD_POSTCLK_INIT ) - board_postclk_init, -#endif + CONFIG_IS_ENABLED(BOARD_POSTCLK_INIT, (board_postclk_init,)) env_init,/* initialize environment */ init_baud_rate,/* initialze baudrate settings */ serial_init, /* serial communications setup */
@@ -912,38 +902,25 @@ static const init_fnc_t init_sequence_f[] = { display_options,/* say that we are here */ display_text_info,/* show debugging info if required */ checkcpu, -#if defined(CONFIG_SYSRESET) - print_resetinfo, -#endif -#if defined(CONFIG_DISPLAY_CPUINFO ) - print_cpuinfo, /* display cpu info (and speed) */ -#endif -#if defined(CONFIG_DTB_RESELECT ) - embedded_dtb_select, -#endif -#if defined(CONFIG_DISPLAY_BOARDINFO ) - show_board_info, -#endif + CONFIG_IS_ENABLED(SYSRESET, (print_resetinfo,)) + /* display cpu info (and speed) */ + CONFIG_IS_ENABLED(DISPLAY_CPUINFO, (print_cpuinfo,)) + CONFIG_IS_ENABLED(DTB_RESELECT, (embedded_dtb_select,)) + CONFIG_IS_ENABLED(DISPLAY_BOARDINFO, (show_board_info,))INIT_FUNC_WATCHDOG_INIT INITCALL_EVENT (EVT_MISC_INIT_F ), INIT_FUNC_WATCHDOG_RESET -#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) - init_func_i2c, -#endif + CONFIG_IS_ENABLED(SYS_I2C_LEGACY, (init_func_i2c,)) announce_dram_init, dram_init, /* configure available RAM banks */ -#ifdef CONFIG_POST - post_init_f, -#endif + CONFIG_IS_ENABLED(POST, (post_init_f,)) INIT_FUNC_WATCHDOG_RESET #if defined(CFG_SYS_DRAM_TEST) testdram, #endif /* CFG_SYS_DRAM_TEST */ INIT_FUNC_WATCHDOG_RESET -#ifdef CONFIG_POST - init_post, -#endif + CONFIG_IS_ENABLED(POST, (init_post,)) INIT_FUNC_WATCHDOG_RESET/* * Now that we have DRAM mapped and working, we can
common/board_r.c +33 -95
179 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v3 2/5 board_init_f(): use static calls
In reply to Jerome ForissierMake static calls instead of iterating over the init_sequence_f arrays. Tested on a KV260 board (xilinx_zynqmp_kria_defconfig).
- With LTO enabled, the code size reported by bloat-o-meter is 1037 bytes less (-0.10%)
- With LTO disabled, the code is 193 bytes smaller (-0.02%)
- Execution time does not change in a noticeable way
--- common/board_f.c | 169 +++++++++++++++++++++++---------------------- include/initcall.h | 27 ++++++++ 2 files changed, 114 insertions(+), 82 deletions(-)
common/board_f.c +87 -82
@@ -38,6 +38,7 @@#include <spl.h> #include <status_led.h> #include <sysreset.h> +#include <time.h> #include <timer.h> #include <trace.h> #include <upl.h>
@@ -870,58 +871,64 @@ static int initf_upl(void)return 0 ; } -static const init_fnc_t init_sequence_f[] = { - setup_mon_len, - CONFIG_IS_ENABLED(OF_CONTROL, (fdtdec_setup,)) - CONFIG_IS_ENABLED(TRACE_EARLY, (trace_early_init,)) - initf_malloc, - initf_upl, - log_init, - initf_bootstage,/* uses its own timer, so does not need DM */ - event_init, - bloblist_maybe_init, - setup_spl_handoff, - CONFIG_IS_ENABLED(CONSOLE_RECORD_INIT_F, (console_record_init,)) -INITCALL_EVENT (EVT_FSP_INIT_F ), - arch_cpu_init,/* basic arch cpu dependent setup */ - mach_cpu_init,/* SoC/machine dependent CPU setup */ - initf_dm, - CONFIG_IS_ENABLED(BOARD_EARLY_INIT_F, (board_early_init_f,)) +static void initcall_run_f (void ) +{ +/* +* Please do not add logic to this function (variables, if (), etc.). +* For simplicity it should remain an ordered list of function calls. +*/ +INITCALL (setup_mon_len); +CONFIG_IS_ENABLED (OF_CONTROL , (INITCALL (fdtdec_setup))); +CONFIG_IS_ENABLED (TRACE_EARLY , (INITCALL (trace_early_init))); +INITCALL (initf_malloc); +INITCALL (initf_upl); +INITCALL (log_init); +INITCALL (initf_bootstage);/* uses its own timer, so does not need DM */ +INITCALL (event_init); +INITCALL (bloblist_maybe_init); +INITCALL (setup_spl_handoff); +CONFIG_IS_ENABLED (CONSOLE_RECORD_INIT_F , + (INITCALL(console_record_init);)) +INITCALL_EVT (EVT_FSP_INIT_F ); +INITCALL (arch_cpu_init);/* basic arch cpu dependent setup */ +INITCALL (mach_cpu_init);/* SoC/machine dependent CPU setup */ +INITCALL (initf_dm); + CONFIG_IS_ENABLED(BOARD_EARLY_INIT_F, (INITCALL(board_early_init_f);))#if defined(CONFIG_PPC ) || defined(CONFIG_SYS_FSL_CLK ) || defined(CONFIG_M68K )/* get CPU and bus clocks according to the environment variable */ - get_clocks, /* get CPU and bus clocks (etc.) */ +INITCALL (get_clocks);/* get CPU and bus clocks (etc.) */ #endif #if !defined(CONFIG_M68K ) || (defined(CONFIG_M68K ) && !defined(CONFIG_MCFTMR )) - timer_init, /* initialize timer */ +INITCALL (timer_init);/* initialize timer */ #endif - CONFIG_IS_ENABLED(BOARD_POSTCLK_INIT, (board_postclk_init,)) - env_init,/* initialize environment */ - init_baud_rate,/* initialze baudrate settings */ - serial_init,/* serial communications setup */ - console_init_f,/* stage 1 init of console */ - display_options,/* say that we are here */ - display_text_info,/* show debugging info if required */ - checkcpu, - CONFIG_IS_ENABLED(SYSRESET, (print_resetinfo,)) +CONFIG_IS_ENABLED (BOARD_POSTCLK_INIT , + (INITCALL(board_postclk_init);)) +INITCALL (env_init);/* initialize environment */ +INITCALL (init_baud_rate);/* initialze baudrate settings */ +INITCALL (serial_init);/* serial communications setup */ +INITCALL (console_init_f);/* stage 1 init of console */ +INITCALL (display_options);/* say that we are here */ +INITCALL (display_text_info);/* show debugging info if required */ +INITCALL (checkcpu); + CONFIG_IS_ENABLED(SYSRESET, (INITCALL(print_resetinfo);)) /* display cpu info (and speed) */ - CONFIG_IS_ENABLED(DISPLAY_CPUINFO, (print_cpuinfo,)) - CONFIG_IS_ENABLED(DTB_RESELECT, (embedded_dtb_select,)) - CONFIG_IS_ENABLED(DISPLAY_BOARDINFO, (show_board_info,)) - INIT_FUNC_WATCHDOG_INIT -INITCALL_EVENT (EVT_MISC_INIT_F ), - INIT_FUNC_WATCHDOG_RESET - CONFIG_IS_ENABLED(SYS_I2C_LEGACY, (init_func_i2c,)) - announce_dram_init, - dram_init,/* configure available RAM banks */ - CONFIG_IS_ENABLED(POST, (post_init_f,)) - INIT_FUNC_WATCHDOG_RESET + CONFIG_IS_ENABLED(DISPLAY_CPUINFO, (INITCALL(print_cpuinfo);)) + CONFIG_IS_ENABLED(DTB_RESELECT, (INITCALL(embedded_dtb_select);)) + CONFIG_IS_ENABLED(DISPLAY_BOARDINFO, (INITCALL(show_board_info);)) +WATCHDOG_INIT (); +INITCALL_EVT (EVT_MISC_INIT_F ); +WATCHDOG_RESET (); + CONFIG_IS_ENABLED(SYS_I2C_LEGACY, (INITCALL(init_func_i2c);)) +INITCALL (announce_dram_init); +INITCALL (dram_init);/* configure available RAM banks */ + CONFIG_IS_ENABLED(POST, (INITCALL(post_init_f);)) +WATCHDOG_RESET ();#if defined(CFG_SYS_DRAM_TEST ) - testdram, +INITCALL (testdram);#endif /* CFG_SYS_DRAM_TEST */ - INIT_FUNC_WATCHDOG_RESET - - CONFIG_IS_ENABLED(POST, (init_post,)) -INIT_FUNC_WATCHDOG_RESET +WATCHDOG_RESET (); + CONFIG_IS_ENABLED(POST, (INITCALL(init_post);)) +WATCHDOG_RESET ();/* * Now that we have DRAM mapped and working, we can * relocate the code and continue running from DRAM.
@@ -934,48 +941,48 @@ static const init_fnc_t init_sequence_f[] = {* - monitor code * - board info struct */ - setup_dest_addr, +INITCALL (setup_dest_addr);#if defined(CONFIG_OF_BOARD_FIXUP ) && !defined(CONFIG_OF_INITIAL_DTB_READONLY ) - fix_fdt, +INITCALL (fix_fdt);#endif #ifdef CFG_PRAM - reserve_pram, +INITCALL (reserve_pram);#endif - reserve_round_4k, - setup_relocaddr_from_bloblist, - arch_reserve_mmu, - reserve_video, - reserve_trace, - reserve_uboot, - reserve_malloc, - reserve_board, - reserve_global_data, - reserve_fdt, +INITCALL (reserve_round_4k); +INITCALL (setup_relocaddr_from_bloblist); +INITCALL (arch_reserve_mmu); +INITCALL (reserve_video); +INITCALL (reserve_trace); +INITCALL (reserve_uboot); +INITCALL (reserve_malloc); +INITCALL (reserve_board); +INITCALL (reserve_global_data); +INITCALL (reserve_fdt);#if defined(CONFIG_OF_BOARD_FIXUP ) && defined(CONFIG_OF_INITIAL_DTB_READONLY ) - reloc_fdt, - fix_fdt, +INITCALL (reloc_fdt); +INITCALL (fix_fdt);#endif - reserve_bootstage, - reserve_bloblist, - reserve_arch, - reserve_stacks, - dram_init_banksize, - show_dram_config, - INIT_FUNC_WATCHDOG_RESET - setup_bdinfo, - display_new_sp, - INIT_FUNC_WATCHDOG_RESET +INITCALL (reserve_bootstage); +INITCALL (reserve_bloblist); +INITCALL (reserve_arch); +INITCALL (reserve_stacks); +INITCALL (dram_init_banksize); +INITCALL (show_dram_config); +WATCHDOG_RESET (); +INITCALL (setup_bdinfo); +INITCALL (display_new_sp); +WATCHDOG_RESET ();#if !defined(CONFIG_OF_BOARD_FIXUP ) || !defined(CONFIG_OF_INITIAL_DTB_READONLY ) - reloc_fdt, +INITCALL (reloc_fdt);#endif - reloc_bootstage, - reloc_bloblist, - setup_reloc, +INITCALL (reloc_bootstage); +INITCALL (reloc_bloblist); +INITCALL (setup_reloc);#if defined(CONFIG_X86 ) || defined(CONFIG_ARC ) - copy_uboot_to_ram, - do_elf_reloc_fixups, +INITCALL (copy_uboot_to_ram); +INITCALL (do_elf_reloc_fixups);#endif - clear_bss, +INITCALL (clear_bss);/* * Deregister all cyclic functions before relocation, so that * gd->cyclic_list does not contain any references to pre-relocation
@@ -985,12 +992,11 @@ static const init_fnc_t init_sequence_f[] = {* This should happen as late as possible so that the window where a * watchdog device is not serviced is as small as possible. */ - cyclic_unregister_all, +INITCALL (cyclic_unregister_all);#if !defined(CONFIG_ARM ) && !defined(CONFIG_SANDBOX ) - jump_to_copy, +INITCALL (jump_to_copy);#endif - NULL, -}; +}void board_init_f (ulong boot_flags) {
@@ -1000,8 +1006,7 @@ void board_init_f(ulong boot_flags) gd->flags &= ~GD_FLG_HAVE_CONSOLE ; gd->boardf = &boardf; -if (initcall_run_list (init_sequence_f)) -hang (); +initcall_run_f (); #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ !defined(CONFIG_EFI_APP) && !CONFIG_IS_ENABLED(X86_64) && \
include/initcall.h +27 -0
@@ -8,6 +8,7 @@#include <asm/types.h> #include <event.h> +#include <hang.h> _Static_assert (EVT_COUNT <256 ,"Can only support 256 event types with 8 bits" );
@@ -35,4 +36,30 @@ typedef int (*init_fnc_t)(void);*/ int initcall_run_list (const init_fnc_t init_sequence[]); +#define INITCALL (_call) \ + do { \ + if (_call()) { \ + printf("%s(): initcall %s() failed\n", __func__, \ + #_call); \ + hang(); \ + } \ + } while (0) + +#define INITCALL_EVT (_evt) \ + do { \ + if (event_notify_null(_evt)) { \ + printf("%s(): event %d/%s failed\n", __func__, _evt, \ + event_type_name(_evt)) ; \ + hang(); \ + } \ + } while (0) + +#if defined(CONFIG_WATCHDOG ) || defined(CONFIG_HW_WATCHDOG ) +#define WATCHDOG_INIT () INITCALL(init_func_watchdog_init) +#define WATCHDOG_RESET () INITCALL(init_func_watchdog_reset) +#else +#define WATCHDOG_INIT () +#define WATCHDOG_RESET () +#endif +#endif
Signature · 1 line
2.43.0
PATCH v3 3/5 board_init_f_r(): use static calls
In reply to Jerome ForissierReplace the init_sequence_f_r function array by direct calls.
--- common/board_f.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
common/board_f.c +7 -11
@@ -1020,8 +1020,8 @@ void board_init_f(ulong boot_flags)/* * For now this code is only used on x86. * -* init_sequence_f_r is the list of init functions which are run when -* U-Boot is executing from Flash with a semi-limited 'C' environment. +* Run init functions which are run when U-Boot is executing from Flash with a +* semi-limited 'C' environment. * The following limitations must be considered when implementing an * '_f_r' function: * - 'static' variables are read-only
@@ -1034,18 +1034,14 @@ void board_init_f(ulong boot_flags)* NOTE: At present only x86 uses this route, but it is intended that * all archs will move to this when generic relocation is implemented. */ -static const init_fnc_t init_sequence_f_r[] = { -#if !CONFIG_IS_ENABLED(X86_64) - init_cache_f_r, -#endif - -NULL , -}; +static void initcall_run_f_r (void ) +{ + CONFIG_IS_ENABLED(X86_64, (INITCALL(init_cache_f_r);)) +}void board_init_f_r (void ) { -if (initcall_run_list (init_sequence_f_r)) -hang (); +initcall_run_f_r ();/* * The pre-relocation drivers may be using memory that has now gone
Signature · 1 line
2.43.0
PATCH v3 4/5 board_init_r(): use static calls
In reply to Jerome ForissierReplace the init_sequence_r function array by direct calls. bloat-o-meter stats before/after on u-boot.bin for configuration xilinx_zynqmp_kria_defconfig are the following:
- With LTO:
add/remove: 87/128 grow/shrink: 8/23 up/down: 19743/-20923 (-1180)
Total: Before=1067882, After=1066702, chg -0.11%
- Without LTO:
add/remove: 0/23 grow/shrink: 2/0 up/down: 795/-1112 (-317)
Total: Before=1119494, After=1119177, chg -0.03%
--- arch/sh/lib/board.c | 9 +- common/board_r.c | 175 ++++++++++++++++++------------------ test/py/tests/test_trace.py | 8 +- 3 files changed, 96 insertions(+), 96 deletions(-)
arch/sh/lib/board.c +2 -7
@@ -19,18 +19,13 @@ int dram_init(void)void relocate_code (ulong start_addr_sp,gd_t *new_gd,ulong relocaddr) { -void (*reloc_board_init_r)(gd_t *gd,ulong dest) = board_init_r; - -if (new_gd->reloc_off) { +if (new_gd->reloc_off)memcpy ((void *)new_gd->relocaddr, (void *)(new_gd->relocaddr - new_gd->reloc_off), new_gd->mon_len); - reloc_board_init_r += new_gd->reloc_off; - } - __asm__ __volatile__("mov.l %0, r15\n" : :"m" (new_gd->start_addr_sp));while (1 ) -reloc_board_init_r (new_gd,0x0 ); +board_init_r (new_gd,0x0 ); }
common/board_r.c +90 -85
228 lines not on this page · raw message
test/py/tests/test_trace.py +4 -4
@@ -201,7 +201,7 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat): # Then look for this: # u-boot-1 0..... 282.101375: funcgraph_exit: 0.006 us | } # Then check for this: - # u-boot-1 0..... 282.101375: funcgraph_entry: 0.000 us | calc_reloc_ofs(); + # u-boot-1 0..... 282.101375: funcgraph_entry: 0.000 us | event_init(); expected_indent = None found_start = False
@@ -224,8 +224,8 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat): found_end = True # The next function after initf_bootstage() exits should be - # initcall_is_event() - assert upto == 'calc_reloc_ofs()' + # event_init() + assert upto == 'event_init()' # Now look for initf_dm() and dm_timer_init() so we can check the bootstage # time
@@ -274,7 +274,7 @@ def check_flamegraph(cons, fname, proftool, map_fname, trace_fg): # We expect dm_timer_init() to be called twice: once before relocation and # once after look1 = 'initf_dm;dm_timer_init 1' - look2 = 'board_init_r;initcall_run_list;initr_dm_devices;dm_timer_init 1' + look2 = 'board_init_r;initcall_run_r;initr_dm_devices;dm_timer_init 1' found = 0 with open(trace_fg, 'r') as fd: for line in fd:
Signature · 1 line
2.43.0
Re: [PATCH v3 4/5] board_init_r(): use static calls
Hi Jerome,
Quoted 14 lines · Jerome Forissier
Replace the
init_sequence_rfunction array by direct calls. bloat-o-meter stats before/after on u-boot.bin for configurationxilinx_zynqmp_kria_defconfigare the following:- With LTO:
add/remove: 87/128 grow/shrink: 8/23 up/down: 19743/-20923 (-1180)
Total: Before=1067882, After=1066702, chg -0.11%- Without LTO:
add/remove: 0/23 grow/shrink: 2/0 up/down: 795/-1112 (-317)
Total: Before=1119494, After=1119177, chg -0.03%Signed-off-by Jerome Forissier <[email protected]>---
[...]
common/board_r.c static init_fnc_t init_sequence_r[] = { · line 690
Quoted 7 lines
common/board_r.c +7
-0+INITCALL (stdio_add_devices); +INITCALL (jumptable_init); + CONFIG_IS_ENABLED(API, (INITCALL(api_init);)) +INITCALL (console_init_r);/* fully init console as a device */ +CONFIG_IS_ENABLED (DISPLAY_BOARDINFO_LATE , + (INITCALL(console_announce_r); + INITCALL(show_board_info);))
Not that the array was extremely readable, but I think this is significantly worse. Particularly as my IDE will no longer grey-out sections for config options which are disabled.
I would honestly rather still see pre-processor #if's here, or at least something better than this semicolon-in-macro stuff.
Kind regards,
Quoted 91 lines
common/board_r.c +20
-21/* miscellaneous arch-dependent init */ - CONFIG_IS_ENABLED(ARCH_MISC_INIT, (arch_misc_init,)) + CONFIG_IS_ENABLED(ARCH_MISC_INIT, (INITCALL(arch_misc_init);)) /* miscellaneous platform-dependent init */ - CONFIG_IS_ENABLED(MISC_INIT_R, (misc_init_r,)) - INIT_FUNC_WATCHDOG_RESET - CONFIG_IS_ENABLED(CMD_KGDB, (kgdb_init,)) - interrupt_init, + CONFIG_IS_ENABLED(MISC_INIT_R, (INITCALL(misc_init_r);)) +WATCHDOG_RESET (); + CONFIG_IS_ENABLED(CMD_KGDB, (INITCALL(kgdb_init);)) +INITCALL (interrupt_init);#if defined(CONFIG_MICROBLAZE ) || defined(CONFIG_M68K ) - timer_init, /* initialize timer */ +INITCALL (timer_init);/* initialize timer */ #endif - initr_status_led, - initr_boot_led_blink, +INITCALL (initr_status_led); +INITCALL (initr_boot_led_blink);/* PPC has a udelay(20) here dating from 2002. Why? */ - CONFIG_IS_ENABLED(BOARD_LATE_INIT, (board_late_init,)) - CONFIG_IS_ENABLED(BITBANGMII, (bb_miiphy_init,)) - CONFIG_IS_ENABLED(PCI_ENDPOINT, (pci_ep_init,)) - CONFIG_IS_ENABLED(CMD_NET, (INIT_FUNC_WATCHDOG_RESET initr_net,)) - CONFIG_IS_ENABLED(POST, (initr_post,)) - INIT_FUNC_WATCHDOG_RESET - INITCALL_EVENT(EVT_LAST_STAGE_INIT), + CONFIG_IS_ENABLED(BOARD_LATE_INIT, (INITCALL(board_late_init);)) + CONFIG_IS_ENABLED(BITBANGMII, (INITCALL(bb_miiphy_init);)) + CONFIG_IS_ENABLED(PCI_ENDPOINT, (INITCALL(pci_ep_init);)) + CONFIG_IS_ENABLED(CMD_NET, (WATCHDOG_RESET(); INITCALL(initr_net);)) + CONFIG_IS_ENABLED(POST, (INITCALL(initr_post);)) +WATCHDOG_RESET (); +INITCALL_EVT (EVT_LAST_STAGE_INIT );#if defined(CFG_PRAM ) - initr_mem, +INITCALL (initr_mem);#endif - initr_boot_led_on, - run_main_loop, -}; +INITCALL (initr_boot_led_on); +INITCALL (run_main_loop); +}void board_init_r (gd_t *new_gd,ulong dest_addr) {@@ -734,8 +740,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)#endif gd->flags &= ~GD_FLG_LOG_READY ; -if (initcall_run_list (init_sequence_r)) -hang (); +initcall_run_r ();/* NOTREACHED - run_main_loop() does not return */ hang ();test/py/tests/test_trace.py +4
-4@@ -201,7 +201,7 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat): # Then look for this: # u-boot-1 0..... 282.101375: funcgraph_exit: 0.006 us | } # Then check for this: - # u-boot-1 0..... 282.101375: funcgraph_entry: 0.000 us | calc_reloc_ofs(); + # u-boot-1 0..... 282.101375: funcgraph_entry: 0.000 us | event_init(); expected_indent = None found_start = False@@ -224,8 +224,8 @@ def check_funcgraph(cons, fname, proftool, map_fname, trace_dat): found_end = True # The next function after initf_bootstage() exits should be - # initcall_is_event() - assert upto == 'calc_reloc_ofs()' + # event_init() + assert upto == 'event_init()' # Now look for initf_dm() and dm_timer_init() so we can check the bootstage # time@@ -274,7 +274,7 @@ def check_flamegraph(cons, fname, proftool, map_fname, trace_fg): # We expect dm_timer_init() to be called twice: once before relocation and # once after look1 = 'initf_dm;dm_timer_init 1' - look2 = 'board_init_r;initcall_run_list;initr_dm_devices;dm_timer_init 1' + look2 = 'board_init_r;initcall_run_r;initr_dm_devices;dm_timer_init 1' found = 0 with open(trace_fg, 'r') as fd: for line in fd:
Signature · 1 line
// Caleb (they/them)
Re: [PATCH v3 4/5] board_init_r(): use static calls
Hi Caleb,
Quoted 29 lines · Caleb Connolly
Hi Jerome,
Quoted 14 lines · Jerome Forissier
Replace the
init_sequence_rfunction array by direct calls. bloat-o-meter stats before/after on u-boot.bin for configurationxilinx_zynqmp_kria_defconfigare the following:- With LTO:
add/remove: 87/128 grow/shrink: 8/23 up/down: 19743/-20923 (-1180)
Total: Before=1067882, After=1066702, chg -0.11%- Without LTO:
add/remove: 0/23 grow/shrink: 2/0 up/down: 795/-1112 (-317)
Total: Before=1119494, After=1119177, chg -0.03%Signed-off-by Jerome Forissier <[email protected]>---
[...]
common/board_r.c static init_fnc_t init_sequence_r[] = { · line 690
Quoted 7 lines
common/board_r.c +7
-0+INITCALL (stdio_add_devices); +INITCALL (jumptable_init); + CONFIG_IS_ENABLED(API, (INITCALL(api_init);)) +INITCALL (console_init_r);/* fully init console as a device */ +CONFIG_IS_ENABLED (DISPLAY_BOARDINFO_LATE , + (INITCALL(console_announce_r); + INITCALL(show_board_info);))
Quoted 6 lines
Not that the array was extremely readable, but I think this is significantly worse. Particularly as my IDE will no longer grey-out sections for config options which are disabled.
I would honestly rather still see pre-processor #if's here, or at least something better than this semicolon-in-macro stuff.
Hmmm I think you have a point.
I was actually thinking about having something like
INIT_CALL_CONFIG(DISPLAY_BOARD_INFO_LATE, console_announce_r)
i.e. a macro to combine the two things and the semicolon. But I decided it is really no better than this patch so didn't mention it.
So another option would be to keep the #ifs as you say, with everything else about this patch left alone. I have the same issue with the IDE (I suspect some clever integration could be written to fix it). But I have changed my mind and think #ifs are better, in this case.
Regards,
Simon
PATCH v3 5/5 initcall: remove initcall_run_list()
In reply to Jerome ForissierNow that all initcalls have been converted to static calls, remove initcall_run_list().
--- include/initcall.h | 24 ----------- lib/Makefile | 1 - lib/initcall.c | 102 --------------------------------------------- 3 files changed, 127 deletions(-) delete mode 100644 lib/initcall.c
include/initcall.h +0 -24
@@ -12,30 +12,6 @@_Static_assert (EVT_COUNT <256 ,"Can only support 256 event types with 8 bits" ); -/** -* init_fnc_t - Init function -* -* Return: 0 if OK -ve on error -*/ -typedef int (*init_fnc_t )(void ); - -/* Top bit indicates that the initcall is an event */ -#define INITCALL_IS_EVENT GENMASK(BITS_PER_LONG - 1, 8) -#define INITCALL_EVENT_TYPE GENMASK(7, 0) - -#define INITCALL_EVENT (_type) (void *)((_type) | INITCALL_IS_EVENT) - -/** -* initcall_run_list() - Run through a list of function calls -* -* This calls functions one after the other, stopping at the first error, or -* when NULL is obtained. -* -* @init_sequence: NULL-terminated init sequence to run -* Return: 0 if OK, or -ve error code from the first failure -*/ -int initcall_run_list (const init_fnc_t init_sequence[]); -#define INITCALL (_call) \ do { \ if (_call()) { \
lib/Makefile +0 -1
@@ -44,7 +44,6 @@ 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
lib/initcall.c deleted +0 -102
102 lines not on this page · raw message
Signature · 1 line
2.43.0