diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/board_f.c | 11 | ||||
-rw-r--r-- | common/board_r.c | 1 | ||||
-rw-r--r-- | common/cyclic.c | 32 |
3 files changed, 17 insertions, 27 deletions
diff --git a/common/board_f.c b/common/board_f.c index faa0964..7c26e23 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -839,7 +839,6 @@ static const init_fnc_t init_sequence_f[] = { initf_malloc, log_init, initf_bootstage, /* uses its own timer, so does not need DM */ - cyclic_init, event_init, #ifdef CONFIG_BLOBLIST bloblist_init, @@ -957,6 +956,16 @@ static const init_fnc_t init_sequence_f[] = { do_elf_reloc_fixups, #endif clear_bss, + /* + * Deregister all cyclic functions before relocation, so that + * gd->cyclic_list does not contain any references to pre-relocation + * devices. Drivers will register their cyclic functions anew when the + * devices are probed again. + * + * 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, #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ !CONFIG_IS_ENABLED(X86_64) jump_to_copy, diff --git a/common/board_r.c b/common/board_r.c index 828ad44..db9cfb3 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -617,7 +617,6 @@ static init_fnc_t init_sequence_r[] = { #endif initr_barrier, initr_malloc, - cyclic_init, log_init, initr_bootstage, /* Needs malloc() but has its own timer */ #if defined(CONFIG_CONSOLE_RECORD) diff --git a/common/cyclic.c b/common/cyclic.c index 32d9bf0..a49bfc8 100644 --- a/common/cyclic.c +++ b/common/cyclic.c @@ -22,7 +22,8 @@ void hw_watchdog_reset(void); struct hlist_head *cyclic_get_list(void) { - return &gd->cyclic->cyclic_list; + /* Silence "discards 'volatile' qualifier" warning. */ + return (struct hlist_head *)&gd->cyclic_list; } struct cyclic_info *cyclic_register(cyclic_func_t func, uint64_t delay_us, @@ -30,11 +31,6 @@ struct cyclic_info *cyclic_register(cyclic_func_t func, uint64_t delay_us, { struct cyclic_info *cyclic; - if (!gd->cyclic) { - pr_debug("Cyclic IF not ready yet\n"); - return NULL; - } - cyclic = calloc(1, sizeof(struct cyclic_info)); if (!cyclic) { pr_debug("Memory allocation error\n"); @@ -47,7 +43,7 @@ struct cyclic_info *cyclic_register(cyclic_func_t func, uint64_t delay_us, cyclic->name = strdup(name); cyclic->delay_us = delay_us; cyclic->start_time_us = timer_get_us(); - hlist_add_head(&cyclic->list, &gd->cyclic->cyclic_list); + hlist_add_head(&cyclic->list, cyclic_get_list()); return cyclic; } @@ -71,7 +67,7 @@ void cyclic_run(void) return; gd->flags |= GD_FLG_CYCLIC_RUNNING; - hlist_for_each_entry_safe(cyclic, tmp, &gd->cyclic->cyclic_list, list) { + hlist_for_each_entry_safe(cyclic, tmp, cyclic_get_list(), list) { /* * Check if this cyclic function needs to get called, e.g. * do not call the cyclic func too often @@ -113,31 +109,17 @@ void schedule(void) * schedule() might get called very early before the cyclic IF is * ready. Make sure to only call cyclic_run() when it's initalized. */ - if (gd && gd->cyclic) + if (gd) cyclic_run(); } -int cyclic_uninit(void) +int cyclic_unregister_all(void) { struct cyclic_info *cyclic; struct hlist_node *tmp; - hlist_for_each_entry_safe(cyclic, tmp, &gd->cyclic->cyclic_list, list) + hlist_for_each_entry_safe(cyclic, tmp, cyclic_get_list(), list) cyclic_unregister(cyclic); return 0; } - -int cyclic_init(void) -{ - int size = sizeof(struct cyclic_drv); - - gd->cyclic = (struct cyclic_drv *)malloc(size); - if (!gd->cyclic) - return -ENOMEM; - - memset(gd->cyclic, '\0', size); - INIT_HLIST_HEAD(&gd->cyclic->cyclic_list); - - return 0; -} |