Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions kernel/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ fn main<Info: Debug>(kernel_info: KernelInfo<Info>) {
SchedulerType::FIFO,
);

// Wait until all other CPUs have incremented NUM_CPU, otherwise the num_cpu() function below will return an incorrect value.
awkernel_lib::delay::wait_microsec(100);
NUM_READY_WORKER.store(awkernel_lib::cpu::num_cpu() as u16 - 1, Ordering::SeqCst);

PRIMARY_READY.store(true, Ordering::SeqCst);
Expand Down Expand Up @@ -118,20 +120,33 @@ fn main<Info: Debug>(kernel_info: KernelInfo<Info>) {
}

// Non-primary CPUs.
while !PRIMARY_READY.load(Ordering::SeqCst) {
awkernel_lib::delay::wait_microsec(10);
}

#[cfg(not(feature = "std"))]
{
while !PRIMARY_READY.load(Ordering::SeqCst) {
awkernel_lib::delay::wait_microsec(10);
}

awkernel_lib::interrupt::enable_irq(config::PREEMPT_IRQ);

if let Some(irq) = awkernel_lib::timer::irq_id() {
awkernel_lib::interrupt::enable_irq(irq);
}
}

NUM_READY_WORKER.fetch_sub(1, Ordering::SeqCst);
if NUM_READY_WORKER
.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |x| {
if x > 0 {
Some(x - 1)
} else {
None
}
})
.is_err()
{
panic!(
"NUM_READY_WORKER is already zero: num_cpu() must have returned incorrect CPU number"
);
}

unsafe { task::run() }; // Execute tasks.
}
Expand Down
Loading