From 48721ca9cb168cf609cb65e0a36ec839e7f0a1b6 Mon Sep 17 00:00:00 2001 From: mwojcik Date: Mon, 27 Mar 2023 15:53:32 +0800 Subject: [PATCH] apply rustfmt policies to ddma code --- src/libboard_artiq/src/drtioaux_proto.rs | 98 +++++----- src/runtime/src/comms.rs | 59 +++--- src/runtime/src/kernel/dma.rs | 28 ++- src/runtime/src/kernel/mod.rs | 4 +- src/runtime/src/main.rs | 2 +- src/runtime/src/moninj.rs | 6 +- src/runtime/src/rtio_dma.rs | 230 ++++++++++------------- src/runtime/src/rtio_mgt.rs | 129 ++++++++----- src/satman/src/dma.rs | 81 ++++---- src/satman/src/main.rs | 74 ++++---- 10 files changed, 390 insertions(+), 321 deletions(-) diff --git a/src/libboard_artiq/src/drtioaux_proto.rs b/src/libboard_artiq/src/drtioaux_proto.rs index 73098110..85b6411e 100644 --- a/src/libboard_artiq/src/drtioaux_proto.rs +++ b/src/libboard_artiq/src/drtioaux_proto.rs @@ -136,37 +136,37 @@ pub enum Packet { succeeded: bool, }, - DmaAddTraceRequest { - destination: u8, - id: u32, - last: bool, - length: u16, - trace: [u8; DMA_TRACE_MAX_SIZE] + DmaAddTraceRequest { + destination: u8, + id: u32, + last: bool, + length: u16, + trace: [u8; DMA_TRACE_MAX_SIZE], }, - DmaAddTraceReply { - succeeded: bool + DmaAddTraceReply { + succeeded: bool, }, - DmaRemoveTraceRequest { - destination: u8, - id: u32 + DmaRemoveTraceRequest { + destination: u8, + id: u32, }, - DmaRemoveTraceReply { - succeeded: bool + DmaRemoveTraceReply { + succeeded: bool, }, - DmaPlaybackRequest { - destination: u8, - id: u32, - timestamp: u64 + DmaPlaybackRequest { + destination: u8, + id: u32, + timestamp: u64, }, - DmaPlaybackReply { - succeeded: bool + DmaPlaybackReply { + succeeded: bool, }, - DmaPlaybackStatus { - destination: u8, - id: u32, - error: u8, - channel: u32, - timestamp: u64 + DmaPlaybackStatus { + destination: u8, + id: u32, + error: u8, + channel: u32, + timestamp: u64, }, } @@ -298,7 +298,7 @@ impl Packet { succeeded: reader.read_bool()?, }, - 0xb0 => { + 0xb0 => { let destination = reader.read_u8()?; let id = reader.read_u32()?; let last = reader.read_bool()?; @@ -312,31 +312,31 @@ impl Packet { length: length as u16, trace: trace, } - }, + } 0xb1 => Packet::DmaAddTraceReply { - succeeded: reader.read_bool()? + succeeded: reader.read_bool()?, }, 0xb2 => Packet::DmaRemoveTraceRequest { destination: reader.read_u8()?, - id: reader.read_u32()? + id: reader.read_u32()?, }, 0xb3 => Packet::DmaRemoveTraceReply { - succeeded: reader.read_bool()? + succeeded: reader.read_bool()?, }, 0xb4 => Packet::DmaPlaybackRequest { destination: reader.read_u8()?, id: reader.read_u32()?, - timestamp: reader.read_u64()? + timestamp: reader.read_u64()?, }, 0xb5 => Packet::DmaPlaybackReply { - succeeded: reader.read_bool()? + succeeded: reader.read_bool()?, }, 0xb6 => Packet::DmaPlaybackStatus { destination: reader.read_u8()?, id: reader.read_u32()?, error: reader.read_u8()?, channel: reader.read_u32()?, - timestamp: reader.read_u64()? + timestamp: reader.read_u64()?, }, ty => return Err(Error::UnknownPacket(ty)), @@ -526,12 +526,12 @@ impl Packet { writer.write_bool(succeeded)?; } - Packet::DmaAddTraceRequest { - destination, - id, - last, - trace, - length + Packet::DmaAddTraceRequest { + destination, + id, + last, + trace, + length, } => { writer.write_u8(0xb0)?; writer.write_u8(destination)?; @@ -555,10 +555,10 @@ impl Packet { writer.write_u8(0xb3)?; writer.write_bool(succeeded)?; } - Packet::DmaPlaybackRequest { - destination, - id, - timestamp + Packet::DmaPlaybackRequest { + destination, + id, + timestamp, } => { writer.write_u8(0xb4)?; writer.write_u8(destination)?; @@ -569,12 +569,12 @@ impl Packet { writer.write_u8(0xb5)?; writer.write_bool(succeeded)?; } - Packet::DmaPlaybackStatus { - destination, - id, - error, - channel, - timestamp + Packet::DmaPlaybackStatus { + destination, + id, + error, + channel, + timestamp, } => { writer.write_u8(0xb6)?; writer.write_u8(destination)?; diff --git a/src/runtime/src/comms.rs b/src/runtime/src/comms.rs index bafe2532..da67ba1b 100644 --- a/src/runtime/src/comms.rs +++ b/src/runtime/src/comms.rs @@ -26,9 +26,8 @@ use num_traits::{FromPrimitive, ToPrimitive}; use crate::pl; use crate::{analyzer, kernel, mgmt, moninj, proto_async::*, - rpc, - rtio_mgt::{self, resolve_channel_name}, - rtio_dma}; + rpc, rtio_dma, + rtio_mgt::{self, resolve_channel_name}}; #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum Error { @@ -81,7 +80,6 @@ enum Reply { static CACHE_STORE: Mutex>> = Mutex::new(BTreeMap::new()); - async fn write_header(stream: &TcpStream, reply: Reply) -> Result<()> { stream .send_slice(&[0x5a, 0x5a, 0x5a, 0x5a, reply.to_u8().unwrap()]) @@ -160,7 +158,7 @@ async fn handle_run_kernel( _up_destinations: &Rc>, aux_mutex: &Rc>, routing_table: &drtio_routing::RoutingTable, - timer: GlobalTimer + timer: GlobalTimer, ) -> Result<()> { control.borrow_mut().tx.async_send(kernel::Message::StartRequest).await; loop { @@ -347,22 +345,22 @@ async fn handle_run_kernel( kernel::Message::DmaAwaitRemoteRequest(id) => { let result = rtio_dma::remote_dma::await_done(id as u32, Some(10_000), timer).await; let reply = match result { - Ok(rtio_dma::remote_dma::RemoteState::PlaybackEnded { - error, - channel, - timestamp - }) => kernel::Message::DmaAwaitRemoteReply { - timeout: false, - error: error, - channel: channel, - timestamp: timestamp + Ok(rtio_dma::remote_dma::RemoteState::PlaybackEnded { + error, + channel, + timestamp, + }) => kernel::Message::DmaAwaitRemoteReply { + timeout: false, + error: error, + channel: channel, + timestamp: timestamp, + }, + _ => kernel::Message::DmaAwaitRemoteReply { + timeout: true, + error: 0, + channel: 0, + timestamp: 0, }, - _ => kernel::Message::DmaAwaitRemoteReply { - timeout: true, - error: 0, - channel: 0, - timestamp: 0 - } }; control.borrow_mut().tx.async_send(reply).await; } @@ -428,7 +426,7 @@ async fn handle_connection( up_destinations: &Rc>, aux_mutex: &Rc>, routing_table: &drtio_routing::RoutingTable, - timer: GlobalTimer + timer: GlobalTimer, ) -> Result<()> { stream.set_ack_delay(None); @@ -452,7 +450,15 @@ async fn handle_connection( load_kernel(&buffer, &control, Some(stream)).await?; } Request::RunKernel => { - handle_run_kernel(Some(stream), &control, &up_destinations, aux_mutex, routing_table, timer).await?; + handle_run_kernel( + Some(stream), + &control, + &up_destinations, + aux_mutex, + routing_table, + timer, + ) + .await?; } _ => { error!("unexpected request from host: {:?}", request); @@ -528,7 +534,14 @@ pub fn main(timer: GlobalTimer, cfg: Config) { if let Ok(()) = task::block_on(load_kernel(&buffer, &control, None)) { info!("Starting startup kernel..."); let routing_table = drtio_routing_table.borrow(); - let _ = task::block_on(handle_run_kernel(None, &control, &up_destinations, &aux_mutex, &routing_table, timer)); + let _ = task::block_on(handle_run_kernel( + None, + &control, + &up_destinations, + &aux_mutex, + &routing_table, + timer, + )); info!("Startup kernel finished!"); } else { error!("Error loading startup kernel!"); diff --git a/src/runtime/src/kernel/dma.rs b/src/runtime/src/kernel/dma.rs index 2ff865b5..af405d60 100644 --- a/src/runtime/src/kernel/dma.rs +++ b/src/runtime/src/kernel/dma.rs @@ -17,7 +17,7 @@ pub struct DmaRecorder { pub name: String, pub buffer: Vec, pub duration: i64, - pub enable_ddma: bool + pub enable_ddma: bool, } static mut RECORDER: Option = None; @@ -51,7 +51,7 @@ pub extern "C" fn dma_record_start(name: CSlice) { name, buffer: Vec::new(), duration: 0, - enable_ddma: false + enable_ddma: false, }); } } @@ -168,8 +168,13 @@ pub extern "C" fn dma_playback(timestamp: i64, ptr: i32) { csr::cri_con::selected_write(1); csr::rtio_dma::enable_write(1); #[cfg(has_drtio)] - KERNEL_CHANNEL_1TO0.as_mut().unwrap().send( - Message::DmaStartRemoteRequest{ id: ptr, timestamp: timestamp }); + KERNEL_CHANNEL_1TO0 + .as_mut() + .unwrap() + .send(Message::DmaStartRemoteRequest { + id: ptr, + timestamp: timestamp, + }); while csr::rtio_dma::enable_read() != 0 {} csr::cri_con::selected_write(0); @@ -199,10 +204,17 @@ pub extern "C" fn dma_playback(timestamp: i64, ptr: i32) { } #[cfg(has_drtio)] { - KERNEL_CHANNEL_1TO0.as_mut().unwrap().send( - Message::DmaAwaitRemoteRequest(ptr)); + KERNEL_CHANNEL_1TO0 + .as_mut() + .unwrap() + .send(Message::DmaAwaitRemoteRequest(ptr)); match KERNEL_CHANNEL_0TO1.as_mut().unwrap().recv() { - Message::DmaAwaitRemoteReply { timeout, error, channel, timestamp } => { + Message::DmaAwaitRemoteReply { + timeout, + error, + channel, + timestamp, + } => { if timeout { artiq_raise!( "DMAError", @@ -229,7 +241,7 @@ pub extern "C" fn dma_playback(timestamp: i64, ptr: i32) { } } _ => panic!("Expected DmaAwaitRemoteReply after DmaAwaitRemoteRequest!"), - } + } } } } diff --git a/src/runtime/src/kernel/mod.rs b/src/runtime/src/kernel/mod.rs index b72d3114..308e4fe3 100644 --- a/src/runtime/src/kernel/mod.rs +++ b/src/runtime/src/kernel/mod.rs @@ -56,7 +56,7 @@ pub enum Message { #[cfg(has_drtio)] DmaStartRemoteRequest { id: i32, - timestamp: i64 + timestamp: i64, }, #[cfg(has_drtio)] DmaAwaitRemoteRequest(i32), @@ -65,7 +65,7 @@ pub enum Message { timeout: bool, error: u8, channel: u32, - timestamp: u64 + timestamp: u64, }, #[cfg(has_drtio)] diff --git a/src/runtime/src/main.rs b/src/runtime/src/main.rs index 6bcab9ba..37898883 100644 --- a/src/runtime/src/main.rs +++ b/src/runtime/src/main.rs @@ -46,8 +46,8 @@ mod rtio; #[path = "rtio_acp.rs"] mod rtio; mod rtio_clocking; -mod rtio_mgt; mod rtio_dma; +mod rtio_mgt; static mut SEEN_ASYNC_ERRORS: u8 = 0; diff --git a/src/runtime/src/moninj.rs b/src/runtime/src/moninj.rs index 4dd2e426..6b381c26 100644 --- a/src/runtime/src/moninj.rs +++ b/src/runtime/src/moninj.rs @@ -298,7 +298,11 @@ async fn handle_connection( } } -pub fn start(timer: GlobalTimer, aux_mutex: &Rc>, routing_table: &Rc>) { +pub fn start( + timer: GlobalTimer, + aux_mutex: &Rc>, + routing_table: &Rc>, +) { let aux_mutex = aux_mutex.clone(); let routing_table = routing_table.clone(); task::spawn(async move { diff --git a/src/runtime/src/rtio_dma.rs b/src/runtime/src/rtio_dma.rs index 164acc8a..d24c1796 100644 --- a/src/runtime/src/rtio_dma.rs +++ b/src/runtime/src/rtio_dma.rs @@ -1,12 +1,13 @@ - -use alloc::{collections::BTreeMap, string::String, vec::Vec, rc::Rc}; -use libcortex_a9::{mutex::Mutex, cache::dcci_slice}; -use libboard_zynq::timer::GlobalTimer; -use libboard_artiq::drtio_routing::RoutingTable; -#[cfg(has_drtio)] -use libasync::task; +use alloc::{collections::BTreeMap, rc::Rc, string::String, vec::Vec}; #[cfg(has_drtio)] use core::mem; + +#[cfg(has_drtio)] +use libasync::task; +use libboard_artiq::drtio_routing::RoutingTable; +use libboard_zynq::timer::GlobalTimer; +use libcortex_a9::{cache::dcci_slice, mutex::Mutex}; + use crate::kernel::DmaRecorder; const ALIGNMENT: usize = 16 * 8; @@ -15,32 +16,33 @@ static DMA_RECORD_STORE: Mutex, i64)>> = Mutex::n #[cfg(has_drtio)] pub mod remote_dma { - use super::*; use libboard_zynq::time::Milliseconds; use log::error; + + use super::*; use crate::rtio_mgt::drtio; #[derive(Debug, PartialEq, Clone)] pub enum RemoteState { NotLoaded, Loaded, - PlaybackEnded { error: u8, channel: u32, timestamp: u64 } + PlaybackEnded { error: u8, channel: u32, timestamp: u64 }, } #[derive(Debug, Clone)] struct RemoteTrace { trace: Vec, - pub state: RemoteState + pub state: RemoteState, } impl From> for RemoteTrace { fn from(trace: Vec) -> Self { RemoteTrace { trace: trace, - state: RemoteState::NotLoaded + state: RemoteState::NotLoaded, } } } - + impl RemoteTrace { pub fn get_trace(&self) -> &Vec { &self.trace @@ -51,7 +53,7 @@ pub mod remote_dma { struct TraceSet { id: u32, done_count: Mutex, - traces: Mutex> + traces: Mutex>, } impl TraceSet { @@ -63,35 +65,40 @@ pub mod remote_dma { TraceSet { id: id, done_count: Mutex::new(0), - traces: Mutex::new(trace_map) + traces: Mutex::new(trace_map), } } - pub async fn await_done( - &self, - timeout: Option, - timer: GlobalTimer - ) -> Result { + pub async fn await_done(&self, timeout: Option, timer: GlobalTimer) -> Result { let timeout_ms = Milliseconds(timeout.unwrap_or(10_000)); let limit = timer.get_time() + timeout_ms; - while (timer.get_time() < limit) & - (*(self.done_count.async_lock().await) < self.traces.async_lock().await.len()) { + while (timer.get_time() < limit) + & (*(self.done_count.async_lock().await) < self.traces.async_lock().await.len()) + { task::r#yield().await; } if timer.get_time() >= limit { error!("Remote DMA await done timed out"); return Err("Timed out waiting for results."); } - let mut playback_state: RemoteState = RemoteState::PlaybackEnded { error: 0, channel: 0, timestamp: 0 }; + let mut playback_state: RemoteState = RemoteState::PlaybackEnded { + error: 0, + channel: 0, + timestamp: 0, + }; let mut lock = self.traces.async_lock().await; let trace_iter = lock.iter_mut(); for (_dest, trace) in trace_iter { match trace.state { - RemoteState::PlaybackEnded { - error: e, - channel: _c, - timestamp: _ts - } => if e != 0 { playback_state = trace.state.clone(); }, + RemoteState::PlaybackEnded { + error: e, + channel: _c, + timestamp: _ts, + } => { + if e != 0 { + playback_state = trace.state.clone(); + } + } _ => (), } trace.state = RemoteState::Loaded; @@ -100,47 +107,38 @@ pub mod remote_dma { } pub async fn upload_traces( - &mut self, + &mut self, aux_mutex: &Rc>, routing_table: &RoutingTable, - timer: GlobalTimer + timer: GlobalTimer, ) { let mut lock = self.traces.async_lock().await; let trace_iter = lock.iter_mut(); for (destination, trace) in trace_iter { match drtio::ddma_upload_trace( - aux_mutex, - routing_table, - timer, - self.id, - *destination, - trace.get_trace() - ).await { + aux_mutex, + routing_table, + timer, + self.id, + *destination, + trace.get_trace(), + ) + .await + { Ok(_) => trace.state = RemoteState::Loaded, - Err(e) => error!("Error adding DMA trace on destination {}: {}", destination, e) + Err(e) => error!("Error adding DMA trace on destination {}: {}", destination, e), } } *(self.done_count.async_lock().await) = 0; } - pub async fn erase( - &mut self, - aux_mutex: &Rc>, - routing_table: &RoutingTable, - timer: GlobalTimer - ) { + pub async fn erase(&mut self, aux_mutex: &Rc>, routing_table: &RoutingTable, timer: GlobalTimer) { let lock = self.traces.async_lock().await; let trace_iter = lock.keys(); for destination in trace_iter { - match drtio::ddma_send_erase( - aux_mutex, - routing_table, - timer, - self.id, - *destination - ).await { + match drtio::ddma_send_erase(aux_mutex, routing_table, timer, self.id, *destination).await { Ok(_) => (), - Err(e) => error!("Error adding DMA trace on destination {}: {}", destination, e) + Err(e) => error!("Error adding DMA trace on destination {}: {}", destination, e), } } } @@ -149,19 +147,19 @@ pub mod remote_dma { let mut traces_locked = self.traces.async_lock().await; let mut trace = traces_locked.get_mut(&destination).unwrap(); trace.state = RemoteState::PlaybackEnded { - error: error, - channel: channel, - timestamp: timestamp + error: error, + channel: channel, + timestamp: timestamp, }; *(self.done_count.async_lock().await) += 1; } pub async fn playback( - &self, - aux_mutex: &Rc>, - routing_table: &RoutingTable, - timer: GlobalTimer, - timestamp: u64 + &self, + aux_mutex: &Rc>, + routing_table: &RoutingTable, + timer: GlobalTimer, + timestamp: u64, ) { let mut dest_list: Vec = Vec::new(); { @@ -178,40 +176,37 @@ pub mod remote_dma { // mutex lock must be dropped before sending a playback request to avoid a deadlock, // if PlaybackStatus is sent from another satellite and the state must be updated. for destination in dest_list { - match drtio::ddma_send_playback( - aux_mutex, - routing_table, - timer, - self.id, - destination, - timestamp - ).await { + match drtio::ddma_send_playback(aux_mutex, routing_table, timer, self.id, destination, timestamp).await + { Ok(_) => (), - Err(e) => error!("Error during remote DMA playback: {}", e) + Err(e) => error!("Error during remote DMA playback: {}", e), } } } pub async fn destination_changed( - &mut self, - aux_mutex: &Rc>, + &mut self, + aux_mutex: &Rc>, routing_table: &RoutingTable, timer: GlobalTimer, - destination: u8, up: bool + destination: u8, + up: bool, ) { // update state of the destination, resend traces if it's up if let Some(trace) = self.traces.lock().get_mut(&destination) { if up { match drtio::ddma_upload_trace( - aux_mutex, + aux_mutex, routing_table, timer, self.id, - destination, - trace.get_trace() - ).await { + destination, + trace.get_trace(), + ) + .await + { Ok(_) => trace.state = RemoteState::Loaded, - Err(e) => error!("Error adding DMA trace on destination {}: {}", destination, e) + Err(e) => error!("Error adding DMA trace on destination {}: {}", destination, e), } } else { trace.state = RemoteState::NotLoaded; @@ -226,81 +221,65 @@ pub mod remote_dma { unsafe { TRACES.insert(id, TraceSet::new(id, traces)) }; } - pub async fn await_done( - id: u32, - timeout: Option, - timer: GlobalTimer - ) -> Result { + pub async fn await_done(id: u32, timeout: Option, timer: GlobalTimer) -> Result { let trace_set = unsafe { TRACES.get_mut(&id).unwrap() }; trace_set.await_done(timeout, timer).await } - pub async fn erase( - aux_mutex: &Rc>, - routing_table: &RoutingTable, - timer: GlobalTimer, - id: u32 - ) { + pub async fn erase(aux_mutex: &Rc>, routing_table: &RoutingTable, timer: GlobalTimer, id: u32) { let trace_set = unsafe { TRACES.get_mut(&id).unwrap() }; trace_set.erase(aux_mutex, routing_table, timer).await; - unsafe { TRACES.remove(&id); } + unsafe { + TRACES.remove(&id); + } } - pub async fn upload_traces( - aux_mutex: &Rc>, - routing_table: &RoutingTable, - timer: GlobalTimer, - id: u32 - ) { + pub async fn upload_traces(aux_mutex: &Rc>, routing_table: &RoutingTable, timer: GlobalTimer, id: u32) { let trace_set = unsafe { TRACES.get_mut(&id).unwrap() }; trace_set.upload_traces(aux_mutex, routing_table, timer).await; } pub async fn playback( - aux_mutex: &Rc>, + aux_mutex: &Rc>, routing_table: &RoutingTable, timer: GlobalTimer, - id: u32, - timestamp: u64 + id: u32, + timestamp: u64, ) { let trace_set = unsafe { TRACES.get_mut(&id).unwrap() }; trace_set.playback(aux_mutex, routing_table, timer, timestamp).await; } - pub async fn playback_done( - id: u32, - destination: u8, - error: u8, - channel: u32, - timestamp: u64 - ) { + pub async fn playback_done(id: u32, destination: u8, error: u8, channel: u32, timestamp: u64) { let trace_set = unsafe { TRACES.get_mut(&id).unwrap() }; trace_set.playback_done(destination, error, channel, timestamp).await; } - pub async fn destination_changed( - aux_mutex: &Rc>, - routing_table: &RoutingTable, - timer: GlobalTimer, - destination: u8, - up: bool + pub async fn destination_changed( + aux_mutex: &Rc>, + routing_table: &RoutingTable, + timer: GlobalTimer, + destination: u8, + up: bool, ) { let trace_iter = unsafe { TRACES.values_mut() }; for trace_set in trace_iter { - trace_set.destination_changed(aux_mutex, routing_table, timer, destination, up).await; + trace_set + .destination_changed(aux_mutex, routing_table, timer, destination, up) + .await; } } } - -pub async fn put_record(_aux_mutex: &Rc>, - _routing_table: &RoutingTable, +pub async fn put_record( + _aux_mutex: &Rc>, + _routing_table: &RoutingTable, _timer: GlobalTimer, mut recorder: DmaRecorder, ) -> u32 { #[cfg(has_drtio)] let mut remote_traces: BTreeMap> = BTreeMap::new(); - + #[cfg(has_drtio)] if recorder.enable_ddma { let mut local_trace: Vec = Vec::new(); @@ -312,15 +291,14 @@ pub async fn put_record(_aux_mutex: &Rc>, while recorder.buffer[ptr] != 0 { // ptr + 3 = tgt >> 24 (destination) let len = recorder.buffer[ptr] as usize; - let destination = recorder.buffer[ptr+3]; + let destination = recorder.buffer[ptr + 3]; if destination == 0 { - local_trace.extend(&recorder.buffer[ptr..ptr+len]); - } - else { + local_trace.extend(&recorder.buffer[ptr..ptr + len]); + } else { if let Some(remote_trace) = remote_traces.get_mut(&destination) { - remote_trace.extend(&recorder.buffer[ptr..ptr+len]); + remote_trace.extend(&recorder.buffer[ptr..ptr + len]); } else { - remote_traces.insert(destination, recorder.buffer[ptr..ptr+len].to_vec()); + remote_traces.insert(destination, recorder.buffer[ptr..ptr + len].to_vec()); } } // and jump to the next event @@ -343,8 +321,8 @@ pub async fn put_record(_aux_mutex: &Rc>, let ptr = recorder.buffer[padding..].as_ptr() as u32; let _old_record = DMA_RECORD_STORE - .lock() - .insert(recorder.name, (ptr, recorder.buffer, recorder.duration)); + .lock() + .insert(recorder.name, (ptr, recorder.buffer, recorder.duration)); #[cfg(has_drtio)] { @@ -357,9 +335,7 @@ pub async fn put_record(_aux_mutex: &Rc>, ptr } -pub async fn erase(name: String, _aux_mutex: &Rc>, - _routing_table: &RoutingTable, _timer: GlobalTimer -) { +pub async fn erase(name: String, _aux_mutex: &Rc>, _routing_table: &RoutingTable, _timer: GlobalTimer) { let _entry = DMA_RECORD_STORE.lock().remove(&name); #[cfg(has_drtio)] if let Some((id, _v, _d)) = _entry { @@ -370,4 +346,4 @@ pub async fn erase(name: String, _aux_mutex: &Rc>, pub fn retrieve(name: String) -> Option<(i32, i64)> { let (ptr, _v, duration) = DMA_RECORD_STORE.lock().get(&name)?.clone(); Some((ptr as i32, duration)) -} \ No newline at end of file +} diff --git a/src/runtime/src/rtio_mgt.rs b/src/runtime/src/rtio_mgt.rs index 09945546..bce720fc 100644 --- a/src/runtime/src/rtio_mgt.rs +++ b/src/runtime/src/rtio_mgt.rs @@ -12,17 +12,17 @@ static mut RTIO_DEVICE_MAP: BTreeMap = BTreeMap::new(); #[cfg(has_drtio)] pub mod drtio { - use embedded_hal::blocking::delay::DelayMs; use alloc::vec::Vec; + + use embedded_hal::blocking::delay::DelayMs; use libasync::{delay, task}; - use libboard_artiq::{drtioaux::Error, drtioaux_async, drtioaux_async::Packet}; - use libboard_artiq::drtioaux_proto::DMA_TRACE_MAX_SIZE; + use libboard_artiq::{drtioaux::Error, drtioaux_async, drtioaux_async::Packet, drtioaux_proto::DMA_TRACE_MAX_SIZE}; use libboard_zynq::time::Milliseconds; use log::{error, info, warn}; use super::*; - use crate::{ASYNC_ERROR_BUSY, ASYNC_ERROR_COLLISION, ASYNC_ERROR_SEQUENCE_ERROR, SEEN_ASYNC_ERRORS}; - use crate::rtio_dma::remote_dma; + use crate::{rtio_dma::remote_dma, ASYNC_ERROR_BUSY, ASYNC_ERROR_COLLISION, ASYNC_ERROR_SEQUENCE_ERROR, + SEEN_ASYNC_ERRORS}; pub fn startup( aux_mutex: &Rc>, @@ -69,11 +69,17 @@ pub mod drtio { loop { let reply = recv_aux_timeout(linkno, 200, timer).await; match reply { - Ok(Packet::DmaPlaybackStatus { id, destination, error, channel, timestamp }) => { + Ok(Packet::DmaPlaybackStatus { + id, + destination, + error, + channel, + timestamp, + }) => { remote_dma::playback_done(id, destination, error, channel, timestamp).await; - }, + } Ok(packet) => return Ok(packet), - Err(e) => return Err(e) + Err(e) => return Err(e), } } } @@ -184,8 +190,13 @@ pub mod drtio { async fn process_unsolicited_aux(aux_mutex: &Rc>, linkno: u8) { let _lock = aux_mutex.async_lock().await; match drtioaux_async::recv(linkno).await { - Ok(Some(Packet::DmaPlaybackStatus { id, destination, error, channel, timestamp }) - ) => remote_dma::playback_done(id, destination, error, channel, timestamp).await, + Ok(Some(Packet::DmaPlaybackStatus { + id, + destination, + error, + channel, + timestamp, + })) => remote_dma::playback_done(id, destination, error, channel, timestamp).await, Ok(Some(packet)) => warn!("[LINK#{}] unsolicited aux packet: {:?}", linkno, packet), Ok(None) => (), Err(_) => warn!("[LINK#{}] aux packet error", linkno), @@ -267,7 +278,8 @@ pub mod drtio { match reply { Ok(Packet::DestinationDownReply) => { destination_set_up(routing_table, up_destinations, destination, false).await; - remote_dma::destination_changed(aux_mutex, routing_table, timer, destination, false).await; + remote_dma::destination_changed(aux_mutex, routing_table, timer, destination, false) + .await; } Ok(Packet::DestinationOkReply) => (), Ok(Packet::DestinationSequenceErrorReply { channel }) => { @@ -320,7 +332,8 @@ pub mod drtio { Ok(Packet::DestinationOkReply) => { destination_set_up(routing_table, up_destinations, destination, true).await; init_buffer_space(destination as u8, linkno).await; - remote_dma::destination_changed(aux_mutex, routing_table, timer, destination, true).await; + remote_dma::destination_changed(aux_mutex, routing_table, timer, destination, true) + .await; } Ok(packet) => error!("[DEST#{}] received unexpected aux packet: {:?}", destination, packet), Err(e) => error!("[DEST#{}] communication failed ({})", destination, e), @@ -408,75 +421,107 @@ pub mod drtio { } pub async fn ddma_upload_trace( - aux_mutex: &Rc>, - routing_table: &drtio_routing::RoutingTable, - timer: GlobalTimer, - id: u32, - destination: u8, - trace: &Vec + aux_mutex: &Rc>, + routing_table: &drtio_routing::RoutingTable, + timer: GlobalTimer, + id: u32, + destination: u8, + trace: &Vec, ) -> Result<(), &'static str> { let linkno = routing_table.0[destination as usize][0] - 1; let mut i = 0; while i < trace.len() { let mut trace_slice: [u8; DMA_TRACE_MAX_SIZE] = [0; DMA_TRACE_MAX_SIZE]; - let len: usize = if i + DMA_TRACE_MAX_SIZE < trace.len() { DMA_TRACE_MAX_SIZE } else { trace.len() - i } as usize; + let len: usize = if i + DMA_TRACE_MAX_SIZE < trace.len() { + DMA_TRACE_MAX_SIZE + } else { + trace.len() - i + } as usize; let last = i + len == trace.len(); - trace_slice[..len].clone_from_slice(&trace[i..i+len]); + trace_slice[..len].clone_from_slice(&trace[i..i + len]); i += len; - let reply = aux_transact(aux_mutex, linkno, + let reply = aux_transact( + aux_mutex, + linkno, &Packet::DmaAddTraceRequest { - id: id, destination: destination, last: last, length: len as u16, trace: trace_slice}, - timer).await; + id: id, + destination: destination, + last: last, + length: len as u16, + trace: trace_slice, + }, + timer, + ) + .await; match reply { Ok(Packet::DmaAddTraceReply { succeeded: true }) => (), - Ok(Packet::DmaAddTraceReply { succeeded: false }) => { - return Err("error adding trace on satellite"); }, - Ok(_) => { return Err("adding DMA trace failed, unexpected aux packet"); }, - Err(_) => { return Err("adding DMA trace failed, aux error"); } + Ok(Packet::DmaAddTraceReply { succeeded: false }) => { + return Err("error adding trace on satellite"); + } + Ok(_) => { + return Err("adding DMA trace failed, unexpected aux packet"); + } + Err(_) => { + return Err("adding DMA trace failed, aux error"); + } } } Ok(()) } - pub async fn ddma_send_erase( aux_mutex: &Rc>, routing_table: &drtio_routing::RoutingTable, timer: GlobalTimer, id: u32, - destination: u8 + destination: u8, ) -> Result<(), &'static str> { let linkno = routing_table.0[destination as usize][0] - 1; - let reply = aux_transact(aux_mutex, linkno, - &Packet::DmaRemoveTraceRequest { id: id, destination: destination }, - timer).await; + let reply = aux_transact( + aux_mutex, + linkno, + &Packet::DmaRemoveTraceRequest { + id: id, + destination: destination, + }, + timer, + ) + .await; match reply { Ok(Packet::DmaRemoveTraceReply { succeeded: true }) => Ok(()), Ok(Packet::DmaRemoveTraceReply { succeeded: false }) => Err("satellite DMA erase error"), Ok(_) => Err("adding trace failed, unexpected aux packet"), - Err(_) => Err("erasing trace failed, aux error") + Err(_) => Err("erasing trace failed, aux error"), } } pub async fn ddma_send_playback( - aux_mutex: &Rc>, + aux_mutex: &Rc>, routing_table: &drtio_routing::RoutingTable, - timer: GlobalTimer, - id: u32, - destination: u8, - timestamp: u64 + timer: GlobalTimer, + id: u32, + destination: u8, + timestamp: u64, ) -> Result<(), &'static str> { let linkno = routing_table.0[destination as usize][0] - 1; - let reply = aux_transact(aux_mutex, linkno, &Packet::DmaPlaybackRequest{ - id: id, destination: destination, timestamp: timestamp }, timer).await; + let reply = aux_transact( + aux_mutex, + linkno, + &Packet::DmaPlaybackRequest { + id: id, + destination: destination, + timestamp: timestamp, + }, + timer, + ) + .await; match reply { Ok(Packet::DmaPlaybackReply { succeeded: true }) => Ok(()), Ok(Packet::DmaPlaybackReply { succeeded: false }) => Err("error on DMA playback request"), Ok(_) => Err("received unexpected aux packet during DMA playback"), - Err(_) => Err("aux error on DMA playback") + Err(_) => Err("aux error on DMA playback"), } } - } fn read_device_map(cfg: &Config) -> BTreeMap { diff --git a/src/satman/src/dma.rs b/src/satman/src/dma.rs index 1e7ea88b..0b9964ba 100644 --- a/src/satman/src/dma.rs +++ b/src/satman/src/dma.rs @@ -1,49 +1,48 @@ -use libcortex_a9::cache::dcci_slice; +use alloc::{collections::btree_map::BTreeMap, vec::Vec}; + use libboard_artiq::pl::csr; -use alloc::{vec::Vec, collections::btree_map::BTreeMap}; +use libcortex_a9::cache::dcci_slice; const ALIGNMENT: usize = 64; #[derive(Debug, PartialEq)] enum ManagerState { Idle, - Playback + Playback, } pub struct RtioStatus { - pub id: u32, - pub error: u8, - pub channel: u32, - pub timestamp: u64 + pub id: u32, + pub error: u8, + pub channel: u32, + pub timestamp: u64, } pub enum Error { IdNotFound, PlaybackInProgress, - EntryNotComplete + EntryNotComplete, } #[derive(Debug)] struct Entry { trace: Vec, padding_len: usize, - complete: bool + complete: bool, } #[derive(Debug)] pub struct Manager { entries: BTreeMap, state: ManagerState, - currentid: u32 + currentid: u32, } impl Manager { pub fn new() -> Manager { // in case Manager is created during a DMA in progress // wait for it to end - unsafe { - while csr::rtio_dma::enable_read() != 0 {} - } + unsafe { while csr::rtio_dma::enable_read() != 0 {} } Manager { entries: BTreeMap::new(), currentid: 0, @@ -57,29 +56,37 @@ impl Manager { if entry.complete { // replace entry self.entries.remove(&id); - self.entries.insert(id, Entry { - trace: Vec::new(), - padding_len: 0, - complete: false }); + self.entries.insert( + id, + Entry { + trace: Vec::new(), + padding_len: 0, + complete: false, + }, + ); self.entries.get_mut(&id).unwrap() } else { entry } - }, + } None => { - self.entries.insert(id, Entry { - trace: Vec::new(), - padding_len: 0, - complete: false }); + self.entries.insert( + id, + Entry { + trace: Vec::new(), + padding_len: 0, + complete: false, + }, + ); self.entries.get_mut(&id).unwrap() - }, + } }; entry.trace.extend(&trace[0..trace_len]); if last { entry.trace.push(0); let data_len = entry.trace.len(); - + // Realign. entry.trace.reserve(ALIGNMENT - 1); let padding = ALIGNMENT - entry.trace.as_ptr() as usize % ALIGNMENT; @@ -101,7 +108,7 @@ impl Manager { pub fn erase(&mut self, id: u32) -> Result<(), Error> { match self.entries.remove(&id) { Some(_) => Ok(()), - None => Err(Error::IdNotFound) + None => Err(Error::IdNotFound), } } @@ -110,9 +117,11 @@ impl Manager { return Err(Error::PlaybackInProgress); } - let entry = match self.entries.get(&id){ + let entry = match self.entries.get(&id) { Some(entry) => entry, - None => { return Err(Error::IdNotFound); } + None => { + return Err(Error::IdNotFound); + } }; if !entry.complete { return Err(Error::EntryNotComplete); @@ -126,7 +135,7 @@ impl Manager { unsafe { csr::rtio_dma::base_address_write(ptr as u32); csr::rtio_dma::time_offset_write(timestamp as u64); - + csr::cri_con::selected_write(1); csr::rtio_dma::enable_write(1); // playback has begun here, for status call check_state @@ -144,21 +153,21 @@ impl Manager { return None; } else { self.state = ManagerState::Idle; - unsafe { + unsafe { csr::cri_con::selected_write(0); - let error = csr::rtio_dma::error_read(); + let error = csr::rtio_dma::error_read(); let channel = csr::rtio_dma::error_channel_read(); let timestamp = csr::rtio_dma::error_timestamp_read(); if error != 0 { csr::rtio_dma::error_write(1); } - return Some(RtioStatus { - id: self.currentid, + return Some(RtioStatus { + id: self.currentid, error: error, - channel: channel, - timestamp: timestamp }); + channel: channel, + timestamp: timestamp, + }); } } } - -} \ No newline at end of file +} diff --git a/src/satman/src/main.rs b/src/satman/src/main.rs index b31d0b3d..0a05a72e 100644 --- a/src/satman/src/main.rs +++ b/src/satman/src/main.rs @@ -20,6 +20,7 @@ extern crate alloc; use core::sync::atomic::{AtomicBool, Ordering}; +use dma::Manager as DmaManager; use embedded_hal::blocking::delay::DelayUs; #[cfg(feature = "target_kasli_soc")] use libboard_artiq::io_expander; @@ -36,10 +37,9 @@ use libcortex_a9::{asm, interrupt_handler, spin_lock_yield}; use libregister::{RegisterR, RegisterW}; use libsupport_zynq::ram; -use dma::Manager as DmaManager; -mod repeater; mod dma; +mod repeater; fn drtiosat_reset(reset: bool) { unsafe { @@ -94,7 +94,7 @@ fn process_aux_packet( packet: drtioaux::Packet, timer: &mut GlobalTimer, i2c: &mut I2c, - dma_manager: &mut DmaManager + dma_manager: &mut DmaManager, ) -> Result<(), drtioaux::Error> { // In the code below, *_chan_sel_write takes an u8 if there are fewer than 256 channels, // and u16 otherwise; hence the `as _` conversion. @@ -412,36 +412,33 @@ fn process_aux_packet( ) } - drtioaux::Packet::DmaAddTraceRequest { - destination: _destination, - id, - last, - length, - trace + drtioaux::Packet::DmaAddTraceRequest { + destination: _destination, + id, + last, + length, + trace, } => { forward!(_routing_table, _destination, *_rank, _repeaters, &packet, timer); let succeeded = dma_manager.add(id, last, &trace, length as usize).is_ok(); - drtioaux::send(0, - &drtioaux::Packet::DmaAddTraceReply { succeeded: succeeded }) + drtioaux::send(0, &drtioaux::Packet::DmaAddTraceReply { succeeded: succeeded }) } - drtioaux::Packet::DmaRemoveTraceRequest { - destination: _destination, - id + drtioaux::Packet::DmaRemoveTraceRequest { + destination: _destination, + id, } => { forward!(_routing_table, _destination, *_rank, _repeaters, &packet, timer); let succeeded = dma_manager.erase(id).is_ok(); - drtioaux::send(0, - &drtioaux::Packet::DmaRemoveTraceReply { succeeded: succeeded }) + drtioaux::send(0, &drtioaux::Packet::DmaRemoveTraceReply { succeeded: succeeded }) } - drtioaux::Packet::DmaPlaybackRequest { - destination: _destination, - id, - timestamp + drtioaux::Packet::DmaPlaybackRequest { + destination: _destination, + id, + timestamp, } => { forward!(_routing_table, _destination, *_rank, _repeaters, &packet, timer); let succeeded = dma_manager.playback(id, timestamp).is_ok(); - drtioaux::send(0, - &drtioaux::Packet::DmaPlaybackReply { succeeded: succeeded }) + drtioaux::send(0, &drtioaux::Packet::DmaPlaybackReply { succeeded: succeeded }) } _ => { @@ -457,7 +454,7 @@ fn process_aux_packets( rank: &mut u8, timer: &mut GlobalTimer, i2c: &mut I2c, - dma_manager: &mut DmaManager + dma_manager: &mut DmaManager, ) { let result = drtioaux::recv(0).and_then(|packet| { if let Some(packet) = packet { @@ -645,7 +642,14 @@ pub extern "C" fn main_core0() -> i32 { while drtiosat_link_rx_up() { drtiosat_process_errors(); - process_aux_packets(&mut repeaters, &mut routing_table, &mut rank, &mut timer, &mut i2c, &mut dma_manager); + process_aux_packets( + &mut repeaters, + &mut routing_table, + &mut rank, + &mut timer, + &mut i2c, + &mut dma_manager, + ); #[allow(unused_mut)] for mut rep in repeaters.iter_mut() { rep.service(&routing_table, rank, &mut timer); @@ -663,14 +667,20 @@ pub extern "C" fn main_core0() -> i32 { } } if let Some(status) = dma_manager.check_state() { - info!("playback done, error: {}, channel: {}, timestamp: {}", status.error, status.channel, status.timestamp); - if let Err(e) = drtioaux::send(0, &drtioaux::Packet::DmaPlaybackStatus { - destination: rank, - id: status.id, - error: status.error, - channel: status.channel, - timestamp: status.timestamp - }) { + info!( + "playback done, error: {}, channel: {}, timestamp: {}", + status.error, status.channel, status.timestamp + ); + if let Err(e) = drtioaux::send( + 0, + &drtioaux::Packet::DmaPlaybackStatus { + destination: rank, + id: status.id, + error: status.error, + channel: status.channel, + timestamp: status.timestamp, + }, + ) { error!("error sending DMA playback status: {:?}", e); } }