From 5fb7743d3b7e17599d9764fe46e27b76aa237fb9 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 24 Oct 2025 21:10:19 +0800 Subject: [PATCH] add preemption timer to the kernel we can use the TIMER0 mechanism now that this is available in NTO! --- services/bao1x-hal-service/Cargo.toml | 14 +-- services/bao1x-hal-service/src/api.rs | 37 -------- services/bao1x-hal-service/src/main.rs | 114 +++++++++---------------- 3 files changed, 39 insertions(+), 126 deletions(-) diff --git a/services/bao1x-hal-service/Cargo.toml b/services/bao1x-hal-service/Cargo.toml index f5b9f8857..d9b8ea461 100644 --- a/services/bao1x-hal-service/Cargo.toml +++ b/services/bao1x-hal-service/Cargo.toml @@ -16,16 +16,8 @@ xous-ipc = "0.10.7" log-server = { package = "xous-api-log", version = "0.1.66" } log = "0.4.14" bao1x-hal = { path = "../../libs/bao1x-hal", default-features = false } -bao1x-api = { path = "../../libs/bao1x-api", features = [ - "derive-rkyv", - "std", -] } +bao1x-api = { path = "../../libs/bao1x-api", features = ["derive-rkyv", "std"] } # xous-pl230 = { path = "../../libs/xous-pl230", features = ["bao1x"] } -# xous-pio = { path = "../../libs/xous-pio", default-features = false, features = [ -# "bao1x", -# ] } -# pio-proc = "0.2.2" -# pio = "0.2.1" rand_core = "0.6.4" rand_chacha = "0.3.1" bitfield = "0.13.2" @@ -39,8 +31,6 @@ rkyv = { version = "0.8.8", default-features = false, features = [ [features] app-uart = [] -pio = [] -pio-memlcd = [] rawserial = [] pinger = [] swap = [] @@ -49,6 +39,4 @@ bmp180 = ["bao1x-hal/bmp180"] board-baosec = ["bao1x-hal/board-baosec"] board-baosor = ["bao1x-hal/board-baosor"] board-dabao = ["bao1x-hal/board-dabao"] -# add this feature to enable pre-emption -quantum-timer = ["utralib", "pio"] default = ["app-uart", "utralib"] diff --git a/services/bao1x-hal-service/src/api.rs b/services/bao1x-hal-service/src/api.rs index 6858610c4..8b1378917 100644 --- a/services/bao1x-hal-service/src/api.rs +++ b/services/bao1x-hal-service/src/api.rs @@ -1,38 +1 @@ -#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] -#[cfg(feature = "pio")] -pub enum PioBehavior { - /// PIO pins for sclk, si, scs + IFRAM physical address - #[cfg(feature = "pio-memlcd")] - MemoryLcd(u8, u8, u8, usize), -} -#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] -#[cfg(feature = "pio")] -pub enum BehaviorBase { - Base0, - Base1, - Base2, - Base3, -} - -#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] -#[cfg(feature = "pio")] -pub enum PioResult { - Ok(BehaviorBase), - NoSmAvailable, - PinConflict, -} - -#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] -#[cfg(feature = "pio-memlcd")] -#[repr(usize)] -pub enum MemoryLcdOpcode { - /// Blit a frame, don't block. If a callback is set, messages the callback when done. - BlitFrameNonBlocking = 0, - /// Blit a frame, block until blit is done - BiltFrameBlocking = 1, - /// Poll if blitting is in progress - IsBusy = 2, - /// Sets a callback address as SID + opcode for pingbacks when the blit is done. - SetCallbackServer = 3, -} diff --git a/services/bao1x-hal-service/src/main.rs b/services/bao1x-hal-service/src/main.rs index b5a63be5f..b152e29ad 100644 --- a/services/bao1x-hal-service/src/main.rs +++ b/services/bao1x-hal-service/src/main.rs @@ -6,37 +6,11 @@ use bao1x_hal::{iox::Iox, udma::GlobalConfig}; use bitfield::*; use num_traits::*; use udma::UdmaGlobalConfig; -use utralib::CSR; -#[cfg(feature = "quantum-timer")] use utralib::utra; -#[cfg(feature = "quantum-timer")] use utralib::*; #[cfg(feature = "swap")] use xous::SWAPPER_PID; use xous::{ScalarMessage, sender::Sender}; -#[cfg(feature = "pio")] -use xous_pio::*; - -#[cfg(feature = "quantum-timer")] -struct PreemptionHw { - pub timer_sm: PioSm, - pub irq_csr: CSR, -} - -#[cfg(feature = "quantum-timer")] -fn timer_tick(_irq_no: usize, arg: *mut usize) { - let ptimer = unsafe { &mut *(arg as *mut PreemptionHw) }; - // this call forces preemption every timer tick - // rsyscalls are "raw syscalls" -- used for syscalls that don't have a friendly wrapper around them - // since ReturnToParent is only used here, we haven't wrapped it, so we use an rsyscall - xous::rsyscall(xous::SysCall::ReturnToParent(xous::PID::new(1).unwrap(), 0)) - .expect("couldn't return to parent"); - - // acknowledge the timer - ptimer.timer_sm.sm_interrupt_clear(0); - // clear the pending bit - ptimer.irq_csr.wo(utra::irqarray18::EV_PENDING, ptimer.irq_csr.r(utra::irqarray18::EV_PENDING)); -} #[repr(u32)] #[allow(dead_code)] @@ -89,6 +63,19 @@ fn iox_irq_handler(_irq_no: usize, arg: *mut usize) { .ok(); } +/// Preemption timer call +fn timer_tick(_irq_no: usize, arg: *mut usize) { + let mut timer = CSR::new(arg as *mut u32); + // this call forces preemption every timer tick + // rsyscalls are "raw syscalls" -- used for syscalls that don't have a friendly wrapper around them + // since ReturnToParent is only used here, we haven't wrapped it, so we use an rsyscall + xous::rsyscall(xous::SysCall::ReturnToParent(xous::PID::new(1).unwrap(), 0)) + .expect("couldn't return to parent"); + + // acknowledge the timer + timer.wfo(utra::timer0::EV_PENDING_ZERO, 0b1); +} + fn try_alloc(ifram_allocs: &mut Vec>, size: usize, sender: Sender) -> Option { let mut size_pages = size / 4096; if size % 4096 != 0 { @@ -214,58 +201,33 @@ fn main() { bao1x_hal::udma::I2c::new_with_ifram(i2c_channel, 400_000, bao1x_api::PERCLK, i2c_ifram, &udma_global) }; - // -------------------- begin timer workaround code - // This code should go away with bao1x as we have a proper, private ticktimer unit. - #[cfg(feature = "pio")] - { - let mut pio_ss = xous_pio::PioSharedState::new(); - // map and enable the interrupt for the PIO system timer - let irq18_page = xous::syscall::map_memory( - xous::MemoryAddress::new(utralib::generated::HW_IRQARRAY18_BASE), - None, - 4096, - xous::MemoryFlags::R | xous::MemoryFlags::W, - ) - .expect("couldn't claim irq18 csr"); - let mut ptimer = PreemptionHw { - timer_sm: pio_ss.alloc_sm().unwrap(), - irq_csr: CSR::new(irq18_page.as_mut_ptr() as *mut u32), - }; + // os timer initializations + let ostimer_csr = xous::syscall::map_memory( + xous::MemoryAddress::new(utra::timer0::HW_TIMER0_BASE), + None, + 4096, + xous::MemoryFlags::R | xous::MemoryFlags::W, + ) + .expect("couldn't map Ticktimer CSR range"); + xous::claim_interrupt( + utralib::utra::timer0::TIMER0_IRQ, + timer_tick, + ostimer_csr.as_mut_ptr() as *mut usize, + ) + .expect("couldn't claim IRQ"); - // claim the IRQ for the quanta timer - xous::claim_interrupt( - utralib::LITEX_IRQARRAY18_INTERRUPT, - timer_tick, - &mut ptimer as *mut PreemptionHw as *mut usize, - ) - .expect("couldn't claim IRQ"); + // start the OS timer running + let mut os_timer = CSR::new(ostimer_csr.as_ptr() as *mut u32); + let ms = bao1x_api::SYSTEM_TICK_INTERVAL_MS; + os_timer.wfo(utra::timer0::EN_EN, 0b0); // disable the timer + // load its values + os_timer.wfo(utra::timer0::LOAD_LOAD, (bao1x_hal::board::DEFAULT_FCLK_FREQUENCY / 1_000) * ms); + os_timer.wfo(utra::timer0::RELOAD_RELOAD, (bao1x_hal::board::DEFAULT_FCLK_FREQUENCY / 1_000) * ms); + // enable the timer + os_timer.wfo(utra::timer0::EN_EN, 0b1); - pio_ss.clear_instruction_memory(); - pio_ss.pio.rmwf(utra::rp_pio::SFR_CTRL_EN, 0); - #[rustfmt::skip] - let timer_code = pio_proc::pio_asm!( - "restart:", - "set x, 6", // 4 cycles overhead gets us to 10 iterations per pulse - "waitloop:", - "jmp x-- waitloop", - "irq set 0", - "jmp restart", - ); - let a_prog = LoadedProg::load(timer_code.program, &mut pio_ss).unwrap(); - ptimer.timer_sm.sm_set_enabled(false); - a_prog.setup_default_config(&mut ptimer.timer_sm); - ptimer.timer_sm.config_set_clkdiv(50_000.0f32); // set to 1ms per cycle - ptimer.timer_sm.sm_init(a_prog.entry()); - ptimer.timer_sm.sm_irq0_source_enabled(PioIntSource::Sm, true); - ptimer.timer_sm.sm_set_enabled(true); - - #[cfg(feature = "quantum-timer")] - { - ptimer.irq_csr.wfo(utra::irqarray18::EV_ENABLE_PIOIRQ0_DUPE, 1); - log::info!("Quantum timer setup!"); - } - } - // -------------------- end timer workaround code + // Set EV_ENABLE, this starts pre-emption + os_timer.wfo(utra::timer0::EV_ENABLE_ZERO, 0b1); // ---- "own" the Iox IRQ bank. This might need revision once bao1x aliasing is available. --- let irq_page = xous::syscall::map_memory(