mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-20 09:03:28 +00:00
fix bugs in i2c timeout handler
seems to work now, recovers from timeout conditions more gracefully.
This commit is contained in:
parent
a59de6d655
commit
ee6561f5d9
2 changed files with 16 additions and 7 deletions
|
|
@ -282,7 +282,7 @@ impl I2cStateMachine {
|
||||||
self.index = 0;
|
self.index = 0;
|
||||||
self.error = I2cIntError::NoErr;
|
self.error = I2cIntError::NoErr;
|
||||||
} else {
|
} else {
|
||||||
panic!("Invalid state: response requested but no request pending {:?}", status);
|
log::error!("Invalid state: response requested but no request pending {:?}. I2C bus state may be incoherent.", status);
|
||||||
}
|
}
|
||||||
if self.workqueue.len() > 0 {
|
if self.workqueue.len() > 0 {
|
||||||
log::debug!("workqueue has pending items: {}", self.workqueue.len());
|
log::debug!("workqueue has pending items: {}", self.workqueue.len());
|
||||||
|
|
@ -326,6 +326,11 @@ impl I2cStateMachine {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/// This returns if a transaction is currently in progress. This differs from is_busy in that is_busy
|
||||||
|
/// will return false if the work queue is also empty, even though the interface is performing a transaction.
|
||||||
|
pub fn in_progress(&self) -> bool {
|
||||||
|
self.state != I2cState::Idle
|
||||||
|
}
|
||||||
pub(crate) fn trace(&self) {
|
pub(crate) fn trace(&self) {
|
||||||
log::debug!("I2C trace '{:?}/{:?}'=> PENDING: {:x}, ENABLE: {:x}, CMD: {:x}, STATUS: {:x}, CONTROL: {:x}, PRESCALE: {:x}",
|
log::debug!("I2C trace '{:?}/{:?}'=> PENDING: {:x}, ENABLE: {:x}, CMD: {:x}, STATUS: {:x}, CONTROL: {:x}, PRESCALE: {:x}",
|
||||||
self.state,
|
self.state,
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,9 @@ use std::sync::atomic::{AtomicBool, AtomicU32, Ordering};
|
||||||
|
|
||||||
use std::thread;
|
use std::thread;
|
||||||
|
|
||||||
const POLL_INTERVAL_MS: usize = 50;
|
// This is slower than most timeout specifiers, but it's easier to debug
|
||||||
|
// when the check interval isn't creating a ton of log spew.
|
||||||
|
const POLL_INTERVAL_MS: usize = 250;
|
||||||
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
|
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
|
||||||
enum PumpOp {
|
enum PumpOp {
|
||||||
Pump,
|
Pump,
|
||||||
|
|
@ -59,11 +61,11 @@ fn i2c_thread(i2c_sid: xous::SID) {
|
||||||
match FromPrimitive::from_usize(msg.body.id()) {
|
match FromPrimitive::from_usize(msg.body.id()) {
|
||||||
Some(PumpOp::Pump) => msg_scalar_unpack!(msg, _, _, _, _, {
|
Some(PumpOp::Pump) => msg_scalar_unpack!(msg, _, _, _, _, {
|
||||||
tt.sleep_ms(POLL_INTERVAL_MS).unwrap();
|
tt.sleep_ms(POLL_INTERVAL_MS).unwrap();
|
||||||
let target_time = target_lsb.load(Ordering::SeqCst) as u64 | (target_msb.load(Ordering::SeqCst) as u64) << 32;
|
|
||||||
if tt.elapsed_ms() >= target_time {
|
|
||||||
try_send_message(main_cid, Message::new_scalar(I2cOpcode::I2cTimeout.to_usize().unwrap(), 0, 0, 0, 0)).ok();
|
|
||||||
}
|
|
||||||
if run.load(Ordering::SeqCst) {
|
if run.load(Ordering::SeqCst) {
|
||||||
|
let target_time = target_lsb.load(Ordering::SeqCst) as u64 | (target_msb.load(Ordering::SeqCst) as u64) << 32;
|
||||||
|
if tt.elapsed_ms() >= target_time {
|
||||||
|
try_send_message(main_cid, Message::new_scalar(I2cOpcode::I2cTimeout.to_usize().unwrap(), 0, 0, 0, 0)).ok();
|
||||||
|
}
|
||||||
try_send_message(cid, Message::new_scalar(PumpOp::Pump.to_usize().unwrap(), 0, 0, 0, 0)).ok();
|
try_send_message(cid, Message::new_scalar(PumpOp::Pump.to_usize().unwrap(), 0, 0, 0, 0)).ok();
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|
@ -168,10 +170,12 @@ fn i2c_thread(i2c_sid: xous::SID) {
|
||||||
xous::return_scalar(msg.sender, busy as _).expect("couldn't return I2cIsBusy");
|
xous::return_scalar(msg.sender, busy as _).expect("couldn't return I2cIsBusy");
|
||||||
}),
|
}),
|
||||||
Some(I2cOpcode::I2cTimeout) => {
|
Some(I2cOpcode::I2cTimeout) => {
|
||||||
if i2c.is_busy() {
|
if i2c.in_progress() {
|
||||||
// timeout happened
|
// timeout happened
|
||||||
|
log::warn!("Timeout detected, re-initiating transaction");
|
||||||
i2c.re_initiate();
|
i2c.re_initiate();
|
||||||
if let Some(expiry) = i2c.get_expiry() {
|
if let Some(expiry) = i2c.get_expiry() {
|
||||||
|
log::debug!("Setting new expiry to {}", expiry);
|
||||||
target_msb.store((expiry >> 32) as u32, Ordering::SeqCst);
|
target_msb.store((expiry >> 32) as u32, Ordering::SeqCst);
|
||||||
target_lsb.store(expiry as u32, Ordering::SeqCst);
|
target_lsb.store(expiry as u32, Ordering::SeqCst);
|
||||||
// no need to pump since the timeout loop is already running
|
// no need to pump since the timeout loop is already running
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue