From 539ca0cb56f42df4ac2fcc0810b83ebbf8652630 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Sun, 16 Jul 2023 15:31:09 +0800 Subject: [PATCH] xous-ticktimer: delay installing irq handler Wait until the outside of `new()` in order to install the irq handler. This is due to a change in the optimizer for 1.71.0 which has exposed unsoundness. Signed-off-by: Sean Cross --- .../src/platform/precursor/implementation.rs | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/services/xous-ticktimer/src/platform/precursor/implementation.rs b/services/xous-ticktimer/src/platform/precursor/implementation.rs index 96e27eaa2..4d3c2541e 100644 --- a/services/xous-ticktimer/src/platform/precursor/implementation.rs +++ b/services/xous-ticktimer/src/platform/precursor/implementation.rs @@ -10,6 +10,7 @@ use utralib::generated::*; pub struct XousTickTimer { csr: utralib::CSR, + initialized: bool, current_response: Option, last_response: Option, connection: xous::CID, @@ -73,6 +74,7 @@ impl XousTickTimer { let mut xtt = XousTickTimer { csr: CSR::new(csr.as_mut_ptr() as *mut u32), + initialized: false, current_response: None, last_response: None, connection, @@ -89,22 +91,6 @@ impl XousTickTimer { // xtt.wdt_sr_manager.push(RegOrField::Field(utra::wdt::WATCHDOG_ENABLE), None); } - xous::claim_interrupt( - utra::ticktimer::TICKTIMER_IRQ, - handle_irq, - (&mut xtt) as *mut XousTickTimer as *mut usize, - ) - .expect("couldn't claim irq"); - - xtt.ticktimer_sr_manager - .push(RegOrField::Reg(utra::ticktimer::MSLEEP_TARGET0), None); - xtt.ticktimer_sr_manager - .push(RegOrField::Reg(utra::ticktimer::MSLEEP_TARGET1), None); - xtt.ticktimer_sr_manager - .push_fixed_value(RegOrField::Reg(utra::ticktimer::EV_PENDING), 0xFFFF_FFFF); - xtt.ticktimer_sr_manager - .push(RegOrField::Reg(utra::ticktimer::EV_ENABLE), None); - xtt } @@ -117,6 +103,25 @@ impl XousTickTimer { } pub fn reset(&mut self) { + if ! self.initialized { + xous::claim_interrupt( + utra::ticktimer::TICKTIMER_IRQ, + handle_irq, + self as *mut XousTickTimer as *mut usize, + ) + .expect("couldn't claim irq"); + + self.ticktimer_sr_manager + .push(RegOrField::Reg(utra::ticktimer::MSLEEP_TARGET0), None); + self.ticktimer_sr_manager + .push(RegOrField::Reg(utra::ticktimer::MSLEEP_TARGET1), None); + self.ticktimer_sr_manager + .push_fixed_value(RegOrField::Reg(utra::ticktimer::EV_PENDING), 0xFFFF_FFFF); + self.ticktimer_sr_manager + .push(RegOrField::Reg(utra::ticktimer::EV_ENABLE), None); + + self.initialized = true; + } self.csr.wfo(utra::ticktimer::CONTROL_RESET, 0b1); self.csr.wo(utra::ticktimer::CONTROL, 0); // not paused, not reset -> free-run }