M-Labs/artiq-zynq
10
1
Fork 20
Code Issues 13 Pull Requests 1 Releases Wiki Activity

use csr::virtual_leds for SFP0..3 LED indication #244

Merged
sb10q merged 10 commits from morgan/artiq-zynq:feature into master 2023-08-28 16:08:11 +08:00
Conversation 0 Commits 10 Files Changed 4 +27 -25
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cee22f43aa - Show all commits

33
src/runtime/src/main.rs
View File

@ -103,19 +103,13 @@ async fn report_async_rtio_errors() {
} }
#[cfg(all(feature = "target_kasli_soc", has_drtio))] #[cfg(all(feature = "target_kasli_soc", has_drtio))]
static mut SEEN_RTIO_LED: u8 = 0; static mut LAST_VIRTUAL_LED_STATUS: u8 = 0;
#[cfg(all(feature = "target_kasli_soc", has_drtio))]
static mut READ_RTIO_LED: u8 = 0;
#[cfg(all(feature = "target_kasli_soc", has_drtio))] #[cfg(all(feature = "target_kasli_soc", has_drtio))]
fn wait_for_rtio_led_change() -> nb::Result<(), Void> { fn wait_for_virtual_leds_change() -> nb::Result<(), Void> {
unsafe { unsafe {
let len: usize = pl::csr::DRTIO.len(); if pl::csr::virtual_leds::status_read() != LAST_VIRTUAL_LED_STATUS {
READ_RTIO_LED = 0; LAST_VIRTUAL_LED_STATUS = pl::csr::virtual_leds::status_read();
for linkno in 0..len {
READ_RTIO_LED |= (pl::csr::DRTIO[linkno].rx_up_read)() << linkno;
}
if READ_RTIO_LED != SEEN_RTIO_LED {
Ok(()) Ok(())
} else { } else {
Err(nb::Error::WouldBlock) Err(nb::Error::WouldBlock)
@ -124,15 +118,16 @@ fn wait_for_rtio_led_change() -> nb::Result<(), Void> {
} }
#[cfg(all(feature = "target_kasli_soc", has_drtio))] #[cfg(all(feature = "target_kasli_soc", has_drtio))]
async fn async_rtio_led() { async fn async_rtio_led() {
let _ = block_async!(wait_for_rtio_led_change()).await; let i2c0 = unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() };
unsafe { let i2c1 = unsafe { (&mut i2c::I2C_BUS).as_mut().unwrap() };
let i2c = (&mut i2c::I2C_BUS).as_mut().unwrap(); let mut io_expander0 = io_expander::IoExpander::new(i2c0, 0).unwrap();
for expander_i in 0..=1 { let mut io_expander1 = io_expander::IoExpander::new(i2c1, 1).unwrap();
let mut io_expander = io_expander::IoExpander::new(i2c, expander_i).unwrap(); loop{
io_expander.service().expect("I2C I/O expander service failed"); let _ = block_async!(wait_for_virtual_leds_change()).await;
} info!("switching");
SEEN_RTIO_LED = READ_RTIO_LED; io_expander0.service().expect("I2C I/O expander #0 service failed");
}; io_expander1.service().expect("I2C I/O expander #1 service failed");
}
} }
static mut LOG_BUFFER: [u8; 1 << 17] = [0; 1 << 17]; static mut LOG_BUFFER: [u8; 1 << 17] = [0; 1 << 17];

19
src/satman/src/main.rs
View File

@ -657,6 +657,13 @@ pub extern "C" fn main_core0() -> i32 {
let mut hardware_tick_ts = 0; let mut hardware_tick_ts = 0;
let mut i2c0 = I2c::i2c0();
let mut i2c1 = I2c::i2c0();
i2c0.init().expect("I2C0 initialization failed");
i2c1.init().expect("I2C1 initialization failed");
let mut io_expander0 = io_expander::IoExpander::new(&mut i2c0, 0).unwrap();
let mut io_expander1 = io_expander::IoExpander::new(&mut i2c1, 1).unwrap();
loop { loop {
while !drtiosat_link_rx_up() { while !drtiosat_link_rx_up() {
drtiosat_process_errors(); drtiosat_process_errors();
@ -665,9 +672,9 @@ pub extern "C" fn main_core0() -> i32 {
rep.service(&routing_table, rank, &mut timer); rep.service(&routing_table, rank, &mut timer);
} }
#[cfg(all(feature = "target_kasli_soc", has_drtio))] #[cfg(all(feature = "target_kasli_soc", has_drtio))]
for expander_i in 0..=1 { {
let mut io_expander = io_expander::IoExpander::new(&mut i2c, expander_i).unwrap(); io_expander0.service().expect("I2C I/O expander #0 service failed");
io_expander.service().expect("I2C I/O expander service failed") io_expander1.service().expect("I2C I/O expander #1 service failed");
} }
hardware_tick(&mut hardware_tick_ts, &mut timer); hardware_tick(&mut hardware_tick_ts, &mut timer);
@ -707,9 +714,9 @@ pub extern "C" fn main_core0() -> i32 {
rep.service(&routing_table, rank, &mut timer); rep.service(&routing_table, rank, &mut timer);
} }
#[cfg(all(feature = "target_kasli_soc", has_drtio))] #[cfg(all(feature = "target_kasli_soc", has_drtio))]
for expander_i in 0..=1 { {
let mut io_expander = io_expander::IoExpander::new(&mut i2c, expander_i).unwrap(); io_expander0.service().expect("I2C I/O expander #0 service failed");
io_expander.service().expect("I2C I/O expander service failed") io_expander1.service().expect("I2C I/O expander #1 service failed");
} }
hardware_tick(&mut hardware_tick_ts, &mut timer); hardware_tick(&mut hardware_tick_ts, &mut timer);
if drtiosat_tsc_loaded() { if drtiosat_tsc_loaded() {