M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

runtime: do not reset RTIO PHY on core.reset(). Closes #971

This commit is contained in:
Sebastien Bourdeauducq 2018-03-28 10:51:07 +08:00
parent a844a3350e
commit 9630833033
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/firmware/runtime/kern_hwreq.rs
View File

@ -319,7 +319,7 @@ pub fn process_kern_hwreq(io: &Io, request: &kern::Message) -> io::Result<bool>
match request {
&kern::RtioInitRequest => {
info!("resetting RTIO");
rtio_mgt::init_core();
rtio_mgt::init_core(false);
kern_acknowledge()
}

8
artiq/firmware/runtime/rtio_mgt.rs
View File

@ -244,14 +244,16 @@ pub fn startup(io: &Io) {
}
drtio::startup(io);
init_core();
init_core(true);
io.spawn(4096, async_error_thread);
}
pub fn init_core() {
pub fn init_core(phy: bool) {
unsafe {
csr::rtio_core::reset_write(1);
csr::rtio_core::reset_phy_write(1);
if phy {
csr::rtio_core::reset_phy_write(1);
}
}
drtio::init()
}