From 25f976dbb6773962aee3f3c6a643d85bb44183db Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 19 May 2021 14:17:07 +0800 Subject: [PATCH] kernel: claim uart irq before we enable irqs In order to prevent a race at the start, claim the IRQ before we enable the IRQ. Signed-off-by: Sean Cross --- kernel/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/src/main.rs b/kernel/src/main.rs index 7bb3a419b..ad2d4cf8d 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -63,6 +63,8 @@ pub extern "C" fn init(arg_offset: *const u32, init_offset: *const u32, rpt_offs #[cfg(any(feature = "debug-print", feature = "print-panics"))] { use utralib::generated::*; + xous_kernel::claim_interrupt(utra::uart::UART_IRQ, debug::irq, 0 as *mut usize) + .expect("Couldn't claim debug interrupt"); // Map the serial port so println!() works as expected. mem::MemoryManager::with_mut(|memory_manager| { memory_manager @@ -79,8 +81,6 @@ pub extern "C" fn init(arg_offset: *const u32, init_offset: *const u32, rpt_offs debug::Uart {}.init(); println!("KMAIN (clean boot): Supervisor mode started..."); println!("Claiming IRQ {} via syscall...", utra::uart::UART_IRQ); - xous_kernel::claim_interrupt(utra::uart::UART_IRQ, debug::irq, 0 as *mut usize) - .expect("Couldn't claim debug interrupt"); print!("}} "); // Print the processed kernel arguments