aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2022-10-28 13:50:54 +0200
committerStefan Roese <sr@denx.de>2022-11-02 08:42:03 +0100
commit50128aeb0f8bb5a2d820e4c7a6ac0bb745809fc1 (patch)
tree011dde53e84b297394fdd9456798410374af4c36 /test
parent28968394839bec37dacf6ffc2ae880e38756e917 (diff)
downloadu-boot-50128aeb0f8bb5a2d820e4c7a6ac0bb745809fc1.zip
u-boot-50128aeb0f8bb5a2d820e4c7a6ac0bb745809fc1.tar.gz
u-boot-50128aeb0f8bb5a2d820e4c7a6ac0bb745809fc1.tar.bz2
cyclic: get rid of cyclic_init()
Currently, we must call cyclic_init() at some point before cyclic_register() becomes possible. That turns out to be somewhat awkward, especially with SPL, and has resulted in a watchdog callback not being registered, thus causing the board to prematurely reset. We already rely on gd->cyclic reliably being set to NULL by the asm code that clears all of gd. Now that the cyclic list is a hlist, and thus an empty list is represented by a NULL head pointer, and struct cyclic_drv has no other members, we can just as well drop a level of indirection and put the hlist_head directly in struct global_data. This doesn't increase the size of struct global_data, gets rid of an early malloc(), and generates slightly smaller code. But primarily, this avoids having to call cyclic_init() early; the cyclic infrastructure is simply ready to register callbacks as soon as we enter C code. We can still end up with schedule() being called from asm very early, so we still need to check that gd itself has been properly initialized [*], but once it has, gd->cyclic_list is perfectly fine to access, and will just be an empty list. As for cyclic_uninit(), it was never really the opposite of cyclic_init() since it didn't free the struct cyclic_drv nor set gd->cyclic to NULL. Rename it to cyclic_unregister_all() and use that in test/, and also insert a call at the end of the board_init_f sequence so that gd->cyclic_list is a fresh empty list before we enter board_init_r(). A small piece of ugliness is that I had to add a cast in cyclic_get_list() to silence a "discards 'volatile' qualifier" warning, but that is completely equivalent to the existing handling of the uclass_root_s list_head member. [*] I'm not really sure where we guarantee that the register used for gd contains 0 until it gets explicitly initialized, but that must be the case, otherwise testing gd for being NULL would not make much sense. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Reviewed-by: Stefan Roese <sr@denx.de> Tested-by: Stefan Roese <sr@denx.de> Tested-by: Tim Harvey <tharvey@gateworks.com> # imx8mm-venice-*
Diffstat (limited to 'test')
-rw-r--r--test/test-main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/test-main.c b/test/test-main.c
index ddfd89c..fe3ef6d 100644
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -287,7 +287,6 @@ static int dm_test_restore(struct device_node *of_root)
static int test_pre_run(struct unit_test_state *uts, struct unit_test *test)
{
ut_assertok(event_init());
- ut_assertok(cyclic_init());
if (test->flags & UT_TESTF_DM)
ut_assertok(dm_test_pre_run(uts));
@@ -347,7 +346,7 @@ static int test_post_run(struct unit_test_state *uts, struct unit_test *test)
ut_unsilence_console(uts);
if (test->flags & UT_TESTF_DM)
ut_assertok(dm_test_post_run(uts));
- ut_assertok(cyclic_uninit());
+ ut_assertok(cyclic_unregister_all());
ut_assertok(event_uninit());
free(uts->of_other);