Rework the initialization operations of some kernel modules

In order to avoid workarounds that check whether a module is ready or
not, break the initialization of some core modules into a bootstrap
step for basic BSP initialization, and a setup step that completes
initialization. Most users only need the bootstrap operation as a
dependency, especially since scheduling isn't enabled yet.

1 files changed, 14 insertions, 3 deletions

diff --git a/kern/timer.c b/kern/timer.c
index f61ab71f..cafe49f7 100644
--- a/kern/timer.c
+++ b/kern/timer.c
@@ -410,9 +410,20 @@ timer_bucket_filter(struct timer_bucket *bucket, uint64_t now,
 }
 
 static int __init
+timer_bootstrap(void)
+{
+    timer_cpu_data_init(cpu_local_ptr(timer_cpu_data), 0);
+    return 0;
+}
+
+INIT_OP_DEFINE(timer_bootstrap,
+               INIT_OP_DEP(cpu_setup, true),
+               INIT_OP_DEP(spinlock_setup, true));
+
+static int __init
 timer_setup(void)
 {
-    for (unsigned int cpu = 0; cpu < cpu_count(); cpu++) {
+    for (unsigned int cpu = 1; cpu < cpu_count(); cpu++) {
         timer_cpu_data_init(percpu_ptr(timer_cpu_data, cpu), cpu);
     }
 
@@ -420,8 +431,8 @@ timer_setup(void)
 }
 
 INIT_OP_DEFINE(timer_setup,
-               INIT_OP_DEP(boot_setup_intr, true),
-               INIT_OP_DEP(cpu_mp_probe, true));
+               INIT_OP_DEP(cpu_mp_probe, true),
+               INIT_OP_DEP(spinlock_setup, true));
 
 void
 timer_init(struct timer *timer, timer_fn_t fn, int flags)