mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
add cramium targets to xous-ticktimer
This commit is contained in:
parent
ea2e0cfbac
commit
96b2d74e57
5 changed files with 362 additions and 13 deletions
|
|
@ -28,13 +28,22 @@ atsama5d27 = { git = "https://github.com/Foundation-Devices/atsama5d27.git", bra
|
|||
|
||||
[features]
|
||||
atsama5d27 = ["utralib/atsama5d27"]
|
||||
precursor = ["utralib/precursor", "susres/precursor"]
|
||||
hosted = ["utralib/hosted", "susres/hosted"]
|
||||
renode = ["utralib/renode", "susres/renode"]
|
||||
|
||||
# you may want to remove the watchdog feature if you're debugging a crash, as it will force the system to reboot automatically
|
||||
precursor = ["utralib/precursor", "susres/precursor", "watchdog"]
|
||||
hosted = ["utralib/hosted", "susres/hosted", "watchdog"]
|
||||
renode = ["utralib/renode", "susres/renode", "watchdog"]
|
||||
|
||||
cramium-soc = ["utralib/cramium-soc"]
|
||||
cramium-fpga = ["utralib/cramium-fpga"]
|
||||
|
||||
debug-print = []
|
||||
watchdog = []
|
||||
timestamp = []
|
||||
# you may want to remove the watchdog feature if you're debugging a crash, as it will force the system to reboot automatically
|
||||
default = ["watchdog"]
|
||||
default = [] # watchdog option is now moved into individual platform configs
|
||||
# default = []
|
||||
# default = ["debug-print"]
|
||||
|
||||
# Note to self: if implementing "susres" for cramium targets,
|
||||
# it's currently a "susres" feature flag in the implementation crate,
|
||||
# but 'feature = "cramium-fpga"' clauses in main.rs!
|
||||
|
|
@ -14,7 +14,7 @@ mod platform;
|
|||
use platform::implementation::*;
|
||||
use platform::*;
|
||||
|
||||
#[cfg(not(target_arch = "arm"))]
|
||||
#[cfg(not(any(target_arch = "arm", feature="cramium-soc", feature="cramium-fpga")))]
|
||||
use susres::SuspendOrder;
|
||||
|
||||
fn main() -> ! {
|
||||
|
|
@ -52,15 +52,15 @@ fn main() -> ! {
|
|||
ticktimer.reset(); // reset the time to 0
|
||||
|
||||
// register a suspend/resume listener
|
||||
#[cfg(not(target_arch = "arm"))]
|
||||
#[cfg(not(any(target_arch = "arm", feature="cramium-soc", feature="cramium-fpga")))]
|
||||
let xns = xous_names::XousNames::new().unwrap();
|
||||
|
||||
#[cfg(not(target_arch = "arm"))]
|
||||
#[cfg(not(any(target_arch = "arm", feature="cramium-soc", feature="cramium-fpga")))]
|
||||
let sr_cid =
|
||||
xous::connect(ticktimer_server).expect("couldn't create suspend callback connection");
|
||||
|
||||
#[cfg(not(target_arch = "arm"))]
|
||||
let mut susres = susres::Susres::new(
|
||||
#[cfg(not(any(target_arch = "arm", feature="cramium-soc", feature="cramium-fpga")))]
|
||||
let mut susres = susres::Susres::new(
|
||||
Some(SuspendOrder::Last),
|
||||
&xns,
|
||||
api::Opcode::SuspendResume as u32,
|
||||
|
|
@ -222,7 +222,7 @@ fn main() -> ! {
|
|||
|
||||
api::Opcode::SuspendResume => xous::msg_scalar_unpack!(msg, _token, _, _, _, {
|
||||
ticktimer.suspend();
|
||||
#[cfg(not(target_arch = "arm"))]
|
||||
#[cfg(not(any(target_arch = "arm", feature="cramium-soc", feature="cramium-fpga")))]
|
||||
susres
|
||||
.suspend_until_resume(_token)
|
||||
.expect("couldn't execute suspend/resume");
|
||||
|
|
@ -230,6 +230,7 @@ fn main() -> ! {
|
|||
}),
|
||||
|
||||
api::Opcode::PingWdt => {
|
||||
#[cfg(feature="watchdog")]
|
||||
ticktimer.reset_wdt();
|
||||
}
|
||||
|
||||
|
|
|
|||
332
services/xous-ticktimer/src/platform/cramium/implementation.rs
Normal file
332
services/xous-ticktimer/src/platform/cramium/implementation.rs
Normal file
|
|
@ -0,0 +1,332 @@
|
|||
const TICKS_PER_MS: u64 = 1;
|
||||
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
use crate::TimerRequest;
|
||||
use crate::TimeoutExpiry;
|
||||
#[cfg(features="susres")]
|
||||
use susres::{RegManager, RegOrField, SuspendResume};
|
||||
use utralib::generated::*;
|
||||
|
||||
pub struct XousTickTimer {
|
||||
csr: utralib::CSR<u32>,
|
||||
current_response: Option<TimerRequest>,
|
||||
last_response: Option<TimerRequest>,
|
||||
connection: xous::CID,
|
||||
#[cfg(features="susres")]
|
||||
ticktimer_sr_manager: RegManager<{ utra::ticktimer::TICKTIMER_NUMREGS }>,
|
||||
#[cfg(feature="watchdog")]
|
||||
wdt_sr_manager: RegManager<{ utra::wdt::WDT_NUMREGS }>,
|
||||
#[cfg(feature="watchdog")]
|
||||
wdt: utralib::CSR<u32>,
|
||||
}
|
||||
|
||||
fn handle_irq(_irq_no: usize, arg: *mut usize) {
|
||||
let xtt = unsafe { &mut *(arg as *mut XousTickTimer) };
|
||||
// println!("In IRQ, connection: {}", xtt.connection);
|
||||
|
||||
// Safe because we're in an interrupt, and this interrupt is only
|
||||
// enabled when this value is not None.
|
||||
let response = xtt.current_response.take().unwrap();
|
||||
xous::return_scalar(response.sender, response.kind as usize).ok();
|
||||
|
||||
// Disable the timer
|
||||
xtt.csr.wfo(utra::ticktimer::EV_ENABLE_ALARM, 0);
|
||||
xtt.csr.wfo(utra::ticktimer::EV_PENDING_ALARM, 1);
|
||||
|
||||
// This is dangerous and may return an error if the queue is full.
|
||||
// Which is fine, because the queue is always recalculated any time a message arrives.
|
||||
use num_traits::ToPrimitive;
|
||||
xous::try_send_message(
|
||||
xtt.connection,
|
||||
xous::Message::Scalar(xous::ScalarMessage {
|
||||
id: crate::api::Opcode::RecalculateSleep.to_usize().unwrap(),
|
||||
arg1: response.sender.to_usize(),
|
||||
arg2: response.kind as usize,
|
||||
arg3: response.data,
|
||||
arg4: 0,
|
||||
}),
|
||||
)
|
||||
.ok();
|
||||
|
||||
// Save the response so we can be sure we don't double-return messages.
|
||||
xtt.last_response = Some(response);
|
||||
}
|
||||
|
||||
impl XousTickTimer {
|
||||
pub fn new(connection: xous::CID) -> XousTickTimer {
|
||||
// println!("Connection: {}", connection);
|
||||
let csr = xous::syscall::map_memory(
|
||||
xous::MemoryAddress::new(utra::ticktimer::HW_TICKTIMER_BASE),
|
||||
None,
|
||||
4096,
|
||||
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
||||
)
|
||||
.expect("couldn't map Tick Timer CSR range");
|
||||
#[cfg(feature="watchdog")]
|
||||
let wdt = xous::syscall::map_memory(
|
||||
xous::MemoryAddress::new(utra::wdt::HW_WDT_BASE),
|
||||
None,
|
||||
4096,
|
||||
xous::MemoryFlags::R | xous::MemoryFlags::W,
|
||||
)
|
||||
.expect("couldn't map Watchdog timer CSR range");
|
||||
#[cfg(features="susres")]
|
||||
let ticktimer_sr_manager = RegManager::new(csr.as_mut_ptr() as *mut u32);
|
||||
#[cfg(feature="watchdog")]
|
||||
let wdt_sr_manager = RegManager::new(wdt.as_mut_ptr() as *mut u32);
|
||||
|
||||
let xtt = XousTickTimer {
|
||||
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
||||
current_response: None,
|
||||
last_response: None,
|
||||
connection,
|
||||
#[cfg(features="susres")]
|
||||
ticktimer_sr_manager,
|
||||
#[cfg(feature="watchdog")]
|
||||
wdt_sr_manager,
|
||||
#[cfg(feature="watchdog")]
|
||||
wdt: CSR::new(wdt.as_mut_ptr() as *mut u32),
|
||||
};
|
||||
|
||||
#[cfg(feature = "watchdog")]
|
||||
{
|
||||
xtt.wdt.wfo(utra::wdt::PERIOD_PERIOD, 0x7FFF_FFFF); // about 30 seconds +/- 50%
|
||||
xtt.wdt.wfo(utra::wdt::WATCHDOG_ENABLE, 1);
|
||||
// this is a write-once field that is lost later on, so it must be explicitly managed
|
||||
// xtt.wdt_sr_manager.push(RegOrField::Field(utra::wdt::WATCHDOG_ENABLE), None);
|
||||
}
|
||||
|
||||
xtt
|
||||
}
|
||||
|
||||
pub fn last_response(&self) -> &Option<TimerRequest> {
|
||||
&self.last_response
|
||||
}
|
||||
|
||||
pub fn clear_last_response(&mut self) {
|
||||
self.last_response = None;
|
||||
}
|
||||
pub fn init(&mut self) {
|
||||
xous::claim_interrupt(
|
||||
utra::ticktimer::TICKTIMER_IRQ,
|
||||
handle_irq,
|
||||
self as *mut XousTickTimer as *mut usize,
|
||||
)
|
||||
.expect("couldn't claim irq");
|
||||
|
||||
#[cfg(features="susres")]
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn reset(&mut self) {
|
||||
self.csr.wfo(utra::ticktimer::CONTROL_RESET, 0b1);
|
||||
self.csr.wo(utra::ticktimer::CONTROL, 0); // not paused, not reset -> free-run
|
||||
}
|
||||
|
||||
pub fn raw_ticktime(&self) -> u64 {
|
||||
let mut time: u64 = self.csr.r(utra::ticktimer::TIME0) as u64;
|
||||
time |= (self.csr.r(utra::ticktimer::TIME1) as u64) << 32;
|
||||
|
||||
time
|
||||
}
|
||||
|
||||
pub fn elapsed_ms(&self) -> u64 {
|
||||
self.raw_ticktime() / TICKS_PER_MS
|
||||
}
|
||||
|
||||
pub fn stop_interrupt(&mut self) -> Option<TimerRequest> {
|
||||
// Disable the timer
|
||||
self.csr.wfo(utra::ticktimer::EV_ENABLE_ALARM, 0);
|
||||
|
||||
// Now that the interrupt is disabled, we can see if the interrupt handler has a current response.
|
||||
// If it exists, then that means that an interrupt did NOT fire, and an existing interrupt
|
||||
// is in place.
|
||||
if let Some(sr) = self.current_response.take() {
|
||||
#[cfg(feature = "debug-print")]
|
||||
{
|
||||
log::info!(
|
||||
"Stopping currently-running timer sr.msec: {} elapsed_ms: {}",
|
||||
sr.msec,
|
||||
self.elapsed_ms()
|
||||
);
|
||||
}
|
||||
Some(sr)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
pub fn schedule_response(&mut self, request: TimerRequest) {
|
||||
let irq_target = request.msec;
|
||||
log::trace!(
|
||||
"setting a response at {} ms (current time: {} ms)",
|
||||
irq_target,
|
||||
self.elapsed_ms()
|
||||
);
|
||||
|
||||
// Disable the timer interrupt
|
||||
assert!(self.csr.rf(utra::ticktimer::EV_ENABLE_ALARM) == 0);
|
||||
self.csr.wfo(utra::ticktimer::EV_ENABLE_ALARM, 0);
|
||||
|
||||
// Save a copy of the current sleep request
|
||||
self.current_response = Some(request);
|
||||
|
||||
// Set the new target time
|
||||
self.csr
|
||||
.wo(utra::ticktimer::MSLEEP_TARGET1, (irq_target >> 32) as _);
|
||||
self.csr
|
||||
.wo(utra::ticktimer::MSLEEP_TARGET0, irq_target as _);
|
||||
|
||||
// Clear previous interrupt (if any)
|
||||
self.csr.wfo(utra::ticktimer::EV_PENDING_ALARM, 1);
|
||||
|
||||
// Enable the interrupt
|
||||
self.csr.wfo(utra::ticktimer::EV_ENABLE_ALARM, 1);
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[cfg(feature="watchdog")]
|
||||
pub fn reset_wdt(&mut self) {
|
||||
self.wdt.wfo(utra::wdt::WATCHDOG_RESET_WDT, 1);
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
#[cfg(feature="watchdog")]
|
||||
pub fn check_wdt(&mut self) {
|
||||
let state = self.wdt.r(utra::wdt::STATE);
|
||||
if state & self.wdt.ms(utra::wdt::STATE_DISARMED, 1) == 0 {
|
||||
log::info!(
|
||||
"{} WDT is not disarmed, state: 0x{:x}",
|
||||
self.elapsed_ms(),
|
||||
state
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// the ticktimer suspend/resume routines are a bit trickier than normal, so this isn't a great
|
||||
// example of a generic suspend/resume template
|
||||
pub fn suspend(&mut self) {
|
||||
log::trace!("suspending");
|
||||
#[cfg(features="susres")]
|
||||
self.ticktimer_sr_manager.suspend();
|
||||
#[cfg(feature="watchdog")]
|
||||
self.wdt_sr_manager.suspend();
|
||||
|
||||
// by writing this after suspend(), resume will get the prior value
|
||||
self.csr.wfo(utra::ticktimer::EV_ENABLE_ALARM, 0);
|
||||
}
|
||||
pub fn resume(&mut self) {
|
||||
// this is a write-once bit that's later erased, so it can't be managed automatically
|
||||
// thus we have to restore in manually on a resume
|
||||
#[cfg(feature = "watchdog")]
|
||||
{
|
||||
self.wdt.wfo(utra::wdt::WATCHDOG_ENABLE, 1);
|
||||
}
|
||||
|
||||
// manually clear any pending ticktimer events. This is mainly releveant for a "touch-and-go" simulated suspend.
|
||||
self.csr.wfo(utra::ticktimer::EV_PENDING_ALARM, 1);
|
||||
|
||||
#[cfg(feature="watchdog")]
|
||||
self.wdt_sr_manager.resume();
|
||||
#[cfg(features="susres")]
|
||||
self.ticktimer_sr_manager.resume();
|
||||
|
||||
log::trace!(
|
||||
"ticktimer enable: {}",
|
||||
self.csr.r(utra::ticktimer::EV_ENABLE)
|
||||
);
|
||||
log::trace!(
|
||||
"ticktimer time/target: {}/{}",
|
||||
self.csr.r(utra::ticktimer::TIME0),
|
||||
self.csr.r(utra::ticktimer::MSLEEP_TARGET0)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/// Disable the sleep interrupt and remove the currently-pending sleep item.
|
||||
/// If the sleep item has fired, then there will be no existing sleep item
|
||||
/// remaining.
|
||||
pub fn stop_sleep(
|
||||
&mut self,
|
||||
sleep_heap: &mut BTreeMap<TimeoutExpiry, TimerRequest>, // min-heap with Reverse
|
||||
) {
|
||||
// If there's a sleep request ongoing now, grab it.
|
||||
if let Some(current) = self.stop_interrupt() {
|
||||
#[cfg(feature = "debug-print")]
|
||||
log::info!("Existing request was {:?}", current);
|
||||
sleep_heap.insert(current.msec, current);
|
||||
} else {
|
||||
#[cfg(feature = "debug-print")]
|
||||
log::info!("There was no existing sleep() request");
|
||||
}
|
||||
}
|
||||
|
||||
pub fn start_sleep(
|
||||
&mut self,
|
||||
sleep_heap: &mut BTreeMap<TimeoutExpiry, TimerRequest>, // min-heap with Reverse
|
||||
) {
|
||||
// If there are items in the sleep heap, take the next item that will expire.
|
||||
if let Some((_msec, next_response)) = sleep_heap.pop_first() {
|
||||
#[cfg(feature = "debug-print")]
|
||||
log::info!(
|
||||
"scheduling a response at {} to {} (heap: {:?})",
|
||||
next_response.msec, next_response.sender, sleep_heap
|
||||
);
|
||||
|
||||
self.schedule_response(next_response);
|
||||
} else {
|
||||
#[cfg(feature = "debug-print")]
|
||||
log::info!(
|
||||
"not scheduling a response since the sleep heap is empty ({:?})",
|
||||
sleep_heap
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// Recalculate the sleep timer, optionally adding a new Request to the list of available
|
||||
/// sleep events. This involves stopping the timer, recalculating the newest item, then
|
||||
/// restarting the timer.
|
||||
///
|
||||
/// Note that interrupts are always enabled, which is why we must stop the timer prior to
|
||||
/// reordering the list.
|
||||
pub fn recalculate_sleep(
|
||||
&mut self,
|
||||
sleep_heap: &mut BTreeMap<TimeoutExpiry, TimerRequest>, // min-heap with Reverse
|
||||
new: Option<TimerRequest>,
|
||||
) {
|
||||
self.stop_sleep(sleep_heap);
|
||||
log::trace!("Elapsed: {}", self.elapsed_ms());
|
||||
self.clear_last_response();
|
||||
|
||||
// If we have a new sleep request, add it to the heap.
|
||||
if let Some(mut request) = new {
|
||||
#[cfg(feature = "debug-print")]
|
||||
log::info!("New sleep request was: {:?}", request);
|
||||
|
||||
// Ensure that each timeout only exists once inside the tree
|
||||
request.msec += self.elapsed_ms() as i64;
|
||||
while sleep_heap.contains_key(&request.msec) {
|
||||
request.msec += 1;
|
||||
}
|
||||
|
||||
#[cfg(feature = "debug-print")]
|
||||
log::info!("Modified, the request was: {:?}", request);
|
||||
sleep_heap.insert(request.msec, request);
|
||||
} else {
|
||||
#[cfg(feature = "debug-print")]
|
||||
log::info!("No new sleep request");
|
||||
}
|
||||
|
||||
self.start_sleep(sleep_heap);
|
||||
}
|
||||
}
|
||||
1
services/xous-ticktimer/src/platform/cramium/mod.rs
Normal file
1
services/xous-ticktimer/src/platform/cramium/mod.rs
Normal file
|
|
@ -0,0 +1 @@
|
|||
pub mod implementation;
|
||||
|
|
@ -5,11 +5,11 @@ pub mod precursor;
|
|||
pub use precursor::*;
|
||||
|
||||
#[cfg(any(not(target_os = "xous"),
|
||||
not(any(feature="precursor", feature="renode", feature="atsama5d27", not(target_os = "xous")))
|
||||
not(any(feature="precursor", feature="renode", feature="atsama5d27", feature="cramium-fpga", feature="cramium-soc", not(target_os = "xous")))
|
||||
))]
|
||||
pub mod hosted;
|
||||
#[cfg(any(not(target_os = "xous"),
|
||||
not(any(feature="precursor", feature="renode", feature="atsama5d27", not(target_os = "xous")))
|
||||
not(any(feature="precursor", feature="renode", feature="atsama5d27", feature="cramium-fpga", feature="cramium-soc", not(target_os = "xous")))
|
||||
))]
|
||||
pub use hosted::*;
|
||||
|
||||
|
|
@ -19,6 +19,12 @@ pub mod atsama5d2;
|
|||
#[cfg(any(feature="atsama5d27"))]
|
||||
pub use atsama5d2::*;
|
||||
|
||||
#[cfg(any(feature="cramium-fpga", feature="cramium-soc"))]
|
||||
#[macro_use]
|
||||
pub mod cramium;
|
||||
#[cfg(any(feature="cramium-fpga", feature="cramium-soc"))]
|
||||
pub use cramium::*;
|
||||
|
||||
pub(crate) type TimeoutExpiry = i64;
|
||||
|
||||
#[derive(PartialEq, Eq, PartialOrd, Ord, Copy, Clone)]
|
||||
|
|
|
|||
Loading…
Reference in a new issue