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

satman: fix dma reporting wrong destination

Browse Source
This commit is contained in:
mwojcik 2023-09-22 10:29:48 +08:00
parent f4ceca464f
commit e451598a06
1 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,51 +124,51 @@ fn process_aux_packet(
#[cfg(not(has_drtio_routing))] #[cfg(not(has_drtio_routing))]
let hop = 0; let hop = 0;
if let Some(status) = dma_manager.check_state() {
info!(
"playback done, error: {}, channel: {}, timestamp: {}",
status.error, status.channel, status.timestamp
);
return drtioaux::send(
0,
&drtioaux::Packet::DmaPlaybackStatus {
destination: *_rank,
id: status.id,
error: status.error,
channel: status.channel,
timestamp: status.timestamp,
},
);
}
if hop == 0 { if hop == 0 {
let errors; if let Some(status) = dma_manager.check_state() {
unsafe { info!(
errors = csr::drtiosat::rtio_error_read(); "playback done, error: {}, channel: {}, timestamp: {}",
} status.error, status.channel, status.timestamp
if errors & 1 != 0 { );
let channel; drtioaux::send(
unsafe { 0,
channel = csr::drtiosat::sequence_error_channel_read(); &drtioaux::Packet::DmaPlaybackStatus {
csr::drtiosat::rtio_error_write(1); destination: _destination,
} id: status.id,
drtioaux::send(0, &drtioaux::Packet::DestinationSequenceErrorReply { channel })?; error: status.error,
} else if errors & 2 != 0 { channel: status.channel,
let channel; timestamp: status.timestamp,
unsafe { },
channel = csr::drtiosat::collision_channel_read(); )?;
csr::drtiosat::rtio_error_write(2);
}
drtioaux::send(0, &drtioaux::Packet::DestinationCollisionReply { channel })?;
} else if errors & 4 != 0 {
let channel;
unsafe {
channel = csr::drtiosat::busy_channel_read();
csr::drtiosat::rtio_error_write(4);
}
drtioaux::send(0, &drtioaux::Packet::DestinationBusyReply { channel })?;
} else { } else {
drtioaux::send(0, &drtioaux::Packet::DestinationOkReply)?; let errors;
unsafe {
errors = csr::drtiosat::rtio_error_read();
}
if errors & 1 != 0 {
let channel;
unsafe {
channel = csr::drtiosat::sequence_error_channel_read();
csr::drtiosat::rtio_error_write(1);
}
drtioaux::send(0, &drtioaux::Packet::DestinationSequenceErrorReply { channel })?;
} else if errors & 2 != 0 {
let channel;
unsafe {
channel = csr::drtiosat::collision_channel_read();
csr::drtiosat::rtio_error_write(2);
}
drtioaux::send(0, &drtioaux::Packet::DestinationCollisionReply { channel })?;
} else if errors & 4 != 0 {
let channel;
unsafe {
channel = csr::drtiosat::busy_channel_read();
csr::drtiosat::rtio_error_write(4);
}
drtioaux::send(0, &drtioaux::Packet::DestinationBusyReply { channel })?;
} else {
drtioaux::send(0, &drtioaux::Packet::DestinationOkReply)?;
}
} }
} }