jcoates/artiq-zynq
1
0
Fork 0
forked from M-Labs/artiq-zynq
Code Issues Pull Requests Packages Projects Releases Wiki Activity

comms: handle CXP kernel message

Browse Source 
kernel: add CXP error, read, write, roi viewer kernel messages
comms: send roi viewer setup to satellite
comms: support polling for roi viewer data, read, write request
comms: printout drtio aux and unexpected packet via error macro
comms: pass CXP error to kernel
This commit is contained in:
morgan
2025-07-02 15:42:18 +08:00
parent fcb668dd23
commit 871de86e18
2 changed files with 212 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/libksupport/src/kernel/mod.rs
View File

@@ -1,6 +1,8 @@
use alloc::{string::String, vec::Vec};
use core::ptr;
#[cfg(has_drtio)]
use libboard_artiq::drtioaux_proto::{CXP_PAYLOAD_MAX_SIZE, CXP_PAYLOAD_MAX_SIZE_U64};
use libcortex_a9::{mutex::Mutex, semaphore::Semaphore, sync_channel};
use crate::{RPCException, eh_artiq};
@@ -20,7 +22,7 @@ pub mod rtio;
pub mod rtio;
pub use dma::DmaRecorder;
mod cache;
#[cfg(has_cxp_grabber)]
#[cfg(any(has_drtio, has_cxp_grabber))]
mod cxp;
mod linalg;
#[cfg(has_drtio)]
@@ -162,6 +164,52 @@ pub enum Message {
},
#[cfg(has_drtio)]
SubkernelError(SubkernelStatus),
#[cfg(has_drtio)]
CXPError(String),
#[cfg(has_drtio)]
CXPReadRequest {
destination: u8,
address: u32,
length: u16,
},
#[cfg(has_drtio)]
CXPReadReply {
length: u16,
data: [u8; CXP_PAYLOAD_MAX_SIZE],
},
#[cfg(has_drtio)]
CXPWrite32Request {
destination: u8,
address: u32,
value: u32,
},
#[cfg(has_drtio)]
CXPWrite32Reply,
#[cfg(has_drtio)]
CXPROIViewerSetupRequest {
destination: u8,
x0: u16,
y0: u16,
x1: u16,
y1: u16,
},
#[cfg(has_drtio)]
CXPROIViewerSetupReply,
#[cfg(has_drtio)]
CXPROIViewerDataRequest {
destination: u8,
},
#[cfg(has_drtio)]
CXPROIVIewerPixelDataReply {
length: u16,
data: [u64; CXP_PAYLOAD_MAX_SIZE_U64],
},
#[cfg(has_drtio)]
CXPROIVIewerFrameDataReply {
width: u16,
height: u16,
pixel_code: u16,
},
}
static CHANNEL_0TO1: Mutex<Option<sync_channel::Sender<'static, Message>>> = Mutex::new(None);

164
src/runtime/src/comms.rs
View File

@@ -1,4 +1,6 @@
use alloc::{collections::BTreeMap, rc::Rc, string::String, vec, vec::Vec};
#[cfg(has_drtio)]
use alloc::string::ToString;
use alloc::{collections::BTreeMap, rc::Rc, string::String, vec::Vec};
use core::{cell::RefCell, fmt, slice, str};
use core_io::Error as IoError;
@@ -13,6 +15,8 @@ use ksupport::{kernel, resolve_channel_name};
use libasync::{smoltcp::{Sockets, TcpStream},
task};
use libboard_artiq::drtio_routing;
#[cfg(has_drtio)]
use libboard_artiq::drtioaux::Packet;
#[cfg(feature = "target_kasli_soc")]
use libboard_zynq::error_led::ErrorLED;
use libboard_zynq::{self as zynq,
@@ -559,6 +563,164 @@ async fn handle_run_kernel(
kernel::Message::RtioInitRequest => {
rtio_mgt::drtio::reset(aux_mutex, routing_table).await;
}
#[cfg(has_drtio)]
kernel::Message::CXPReadRequest {
destination,
address,
length,
} => {
let linkno = routing_table.0[destination as usize][0] - 1;
let reply = loop {
let result = rtio_mgt::drtio::aux_transact(
aux_mutex,
linkno,
routing_table,
&Packet::CXPReadRequest {
destination,
address,
length,
},
)
.await;
match result {
Ok(Packet::CXPWaitReply) => {}
Ok(Packet::CXPReadReply { length, data }) => {
break kernel::Message::CXPReadReply { length, data };
}
Ok(Packet::CXPError { length, message }) => {
break kernel::Message::CXPError(
String::from_utf8_lossy(&message[..length as usize]).to_string(),
);
}
Ok(packet) => {
error!("received unexpected aux packet {:?}", packet);
break kernel::Message::CXPError("recevied unexpected drtio aux reply".to_string());
}
Err(e) => {
error!("aux packet error ({})", e);
break kernel::Message::CXPError("drtio aux error".to_string());
}
};
};
control.borrow_mut().tx.async_send(reply).await;
}
#[cfg(has_drtio)]
kernel::Message::CXPWrite32Request {
destination,
address,
value,
} => {
let linkno = routing_table.0[destination as usize][0] - 1;
let reply = loop {
let drtioaux_packet = rtio_mgt::drtio::aux_transact(
aux_mutex,
linkno,
routing_table,
&Packet::CXPWrite32Request {
destination,
address,
value,
},
)
.await;
match drtioaux_packet {
Ok(Packet::CXPWaitReply) => {}
Ok(Packet::CXPWrite32Reply) => break kernel::Message::CXPWrite32Reply,
Ok(Packet::CXPError { length, message }) => {
break kernel::Message::CXPError(
String::from_utf8_lossy(&message[..length as usize]).to_string(),
);
}
Ok(packet) => {
error!("received unexpected aux packet {:?}", packet);
break kernel::Message::CXPError("recevied unexpected drtio aux reply".to_string());
}
Err(e) => {
error!("aux packet error ({})", e);
break kernel::Message::CXPError("drtio aux error".to_string());
}
};
};
control.borrow_mut().tx.async_send(reply).await;
}
#[cfg(has_drtio)]
kernel::Message::CXPROIViewerSetupRequest {
destination,
x0,
y0,
x1,
y1,
} => {
let linkno = routing_table.0[destination as usize][0] - 1;
let drtioaux_packet = rtio_mgt::drtio::aux_transact(
aux_mutex,
linkno,
routing_table,
&Packet::CXPROIViewerSetupRequest {
destination,
x0,
y0,
x1,
y1,
},
)
.await;
let reply = match drtioaux_packet {
Ok(Packet::CXPROIViewerSetupReply) => kernel::Message::CXPROIViewerSetupReply,
Ok(packet) => {
error!("received unexpected aux packet {:?}", packet);
kernel::Message::CXPError("recevied unexpected drtio aux reply".to_string())
}
Err(e) => {
error!("aux packet error ({})", e);
kernel::Message::CXPError("drtio aux error".to_string())
}
};
control.borrow_mut().tx.async_send(reply).await;
}
#[cfg(has_drtio)]
kernel::Message::CXPROIViewerDataRequest { destination } => {
let linkno = routing_table.0[destination as usize][0] - 1;
let reply = loop {
let drtioaux_packet = rtio_mgt::drtio::aux_transact(
aux_mutex,
linkno,
routing_table,
&Packet::CXPROIViewerDataRequest { destination },
)
.await;
let reply = match drtioaux_packet {
Ok(Packet::CXPWaitReply) => {}
Ok(Packet::CXPROIViewerPixelDataReply { length, data }) => {
break kernel::Message::CXPROIVIewerPixelDataReply { length, data };
}
Ok(Packet::CXPROIViewerFrameDataReply {
width,
height,
pixel_code,
}) => {
break kernel::Message::CXPROIVIewerFrameDataReply {
width,
height,
pixel_code,
};
}
Ok(packet) => {
error!("received unexpected aux packet {:?}", packet);
break kernel::Message::CXPError("recevied unexpected drtio aux reply".to_string());
}
Err(e) => {
error!("aux packet error ({})", e);
break kernel::Message::CXPError("drtio aux error".to_string());
}
};
};
control.borrow_mut().tx.async_send(reply).await;
}
_ => {
panic!("unexpected message from core1 while kernel was running: {:?}", reply);
}