mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
transition i2c api on codec, finally found the damn race condition
This commit is contained in:
parent
75bb4805b1
commit
bc82dbd157
7 changed files with 34 additions and 118 deletions
|
|
@ -3,20 +3,13 @@
|
||||||
use utralib::generated::*;
|
use utralib::generated::*;
|
||||||
use xous::MemoryRange;
|
use xous::MemoryRange;
|
||||||
use susres::{RegManager, RegOrField, SuspendResume};
|
use susres::{RegManager, RegOrField, SuspendResume};
|
||||||
use core::sync::atomic::{AtomicU8, AtomicBool, Ordering};
|
use llio::I2cStatus;
|
||||||
use llio::{I2cStatus, I2cTransaction};
|
|
||||||
use crate::api::*;
|
use crate::api::*;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
|
|
||||||
pub const TLV320AIC3100_I2C_ADR: u8 = 0b0011_000;
|
pub const TLV320AIC3100_I2C_ADR: u8 = 0b0011_000;
|
||||||
const I2C_TIMEOUT: u32 = 50;
|
const I2C_TIMEOUT: u32 = 50;
|
||||||
|
|
||||||
static I2C_PENDING: AtomicBool = AtomicBool::new(false);
|
|
||||||
static I2C_READ: [AtomicU8; 8] = [AtomicU8::new(0), AtomicU8::new(0), AtomicU8::new(0), AtomicU8::new(0),
|
|
||||||
AtomicU8::new(0), AtomicU8::new(0), AtomicU8::new(0), AtomicU8::new(0), ];
|
|
||||||
static I2C_READLEN: AtomicU8 = AtomicU8::new(0);
|
|
||||||
|
|
||||||
|
|
||||||
pub struct Codec {
|
pub struct Codec {
|
||||||
csr: utralib::CSR<u32>,
|
csr: utralib::CSR<u32>,
|
||||||
fifo: MemoryRange,
|
fifo: MemoryRange,
|
||||||
|
|
@ -33,28 +26,6 @@ pub struct Codec {
|
||||||
conn: xous::CID,
|
conn: xous::CID,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn i2c_callback(trans: I2cTransaction) {
|
|
||||||
if trans.status == I2cStatus::ResponseReadOk {
|
|
||||||
I2C_PENDING.store(false, Ordering::Relaxed);
|
|
||||||
|
|
||||||
if let Some(rxbuf) = trans.rxbuf {
|
|
||||||
let mut len = trans.rxlen as usize;
|
|
||||||
if len > I2C_READ.len() {
|
|
||||||
log::error!("Received more bytes via I2C than we can return inside our handler");
|
|
||||||
len = I2C_READ.len();
|
|
||||||
}
|
|
||||||
for i in 0..len {
|
|
||||||
I2C_READ[i].store(rxbuf[i], Ordering::Relaxed);
|
|
||||||
}
|
|
||||||
I2C_READLEN.store(len as u8, Ordering::Relaxed);
|
|
||||||
} else {
|
|
||||||
log::error!("i2c_callback: no rx data to unpack!")
|
|
||||||
}
|
|
||||||
} else if trans.status == I2cStatus::ResponseWriteOk {
|
|
||||||
I2C_PENDING.store(false, Ordering::Relaxed);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn audio_handler(_irq_no: usize, arg: *mut usize) {
|
fn audio_handler(_irq_no: usize, arg: *mut usize) {
|
||||||
let codec = unsafe { &mut *(arg as *mut Codec) };
|
let codec = unsafe { &mut *(arg as *mut Codec) };
|
||||||
let volatile_audio = codec.fifo.as_mut_ptr() as *mut u32;
|
let volatile_audio = codec.fifo.as_mut_ptr() as *mut u32;
|
||||||
|
|
@ -112,8 +83,7 @@ impl Codec {
|
||||||
)
|
)
|
||||||
.expect("couldn't map Audio CSR range");
|
.expect("couldn't map Audio CSR range");
|
||||||
|
|
||||||
let mut llio = llio::Llio::new(xns).expect("can't connect to LLIO");
|
let llio = llio::Llio::new(xns).expect("can't connect to LLIO");
|
||||||
llio.hook_i2c_callback(i2c_callback).expect("can't hook I2C callback");
|
|
||||||
|
|
||||||
let mut codec = Codec {
|
let mut codec = Codec {
|
||||||
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
|
||||||
|
|
@ -211,91 +181,30 @@ impl Codec {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn w(&mut self, adr: u8, data: &[u8]) -> bool {
|
fn w(&mut self, adr: u8, data: &[u8]) -> bool {
|
||||||
let mut transaction = I2cTransaction::new();
|
|
||||||
let mut txbuf: [u8; llio::I2C_MAX_LEN] = [0; llio::I2C_MAX_LEN];
|
|
||||||
txbuf[0] = adr;
|
|
||||||
for i in 0..data.len() {
|
|
||||||
txbuf[i+1] = data[i];
|
|
||||||
}
|
|
||||||
transaction.bus_addr = TLV320AIC3100_I2C_ADR;
|
|
||||||
transaction.txbuf = Some(txbuf);
|
|
||||||
transaction.txlen = (data.len() + 1) as u32;
|
|
||||||
transaction.status = I2cStatus::RequestIncoming;
|
|
||||||
transaction.timeout_ms = I2C_TIMEOUT;
|
|
||||||
|
|
||||||
log::trace!("writing to 0x{:x}, {:x?}", adr, data);
|
log::trace!("writing to 0x{:x}, {:x?}", adr, data);
|
||||||
let mut sent = false;
|
match self.llio.i2c_write_sync(TLV320AIC3100_I2C_ADR, adr, data) {
|
||||||
while self.llio.poll_i2c_busy().unwrap() {
|
Ok(status) => {
|
||||||
xous::yield_slice();
|
log::trace!("write returned with status {:?}", status);
|
||||||
}
|
match status {
|
||||||
let mut retries = 0;
|
I2cStatus::ResponseWriteOk => true,
|
||||||
while !sent && retries < 4 {
|
I2cStatus::ResponseBusy => false,
|
||||||
match self.llio.send_i2c_request(transaction) {
|
_ => {log::error!("try_send_i2c unhandled response: {:?}", status); false},
|
||||||
Ok(status) => {
|
|
||||||
match status {
|
|
||||||
I2cStatus::ResponseInProgress => {
|
|
||||||
sent = true;
|
|
||||||
I2C_PENDING.store(true, Ordering::Relaxed);
|
|
||||||
},
|
|
||||||
I2cStatus::ResponseBusy => sent = false,
|
|
||||||
_ => {log::error!("try_send_i2c unhandled response"); return false;},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
_ => {log::error!("try_send_i2c unhandled error"); return false;}
|
|
||||||
}
|
}
|
||||||
retries += 1;
|
_ => {log::error!("try_send_i2c unhandled error"); false}
|
||||||
}
|
}
|
||||||
// block until completed
|
|
||||||
while I2C_PENDING.load(Ordering::Relaxed) {
|
|
||||||
xous::yield_slice();
|
|
||||||
}
|
|
||||||
log::trace!("write done");
|
|
||||||
true
|
|
||||||
}
|
}
|
||||||
fn r(&mut self, adr: u8, data: &mut[u8]) -> bool {
|
fn r(&mut self, adr: u8, data: &mut[u8]) -> bool {
|
||||||
let mut transaction = I2cTransaction::new();
|
match self.llio.i2c_read_sync(TLV320AIC3100_I2C_ADR, adr, data) {
|
||||||
let mut txbuf: [u8; llio::I2C_MAX_LEN] = [0; llio::I2C_MAX_LEN];
|
Ok(status) => {
|
||||||
txbuf[0] = adr;
|
match status {
|
||||||
transaction.bus_addr = TLV320AIC3100_I2C_ADR;
|
I2cStatus::ResponseReadOk => true,
|
||||||
transaction.txbuf = Some(txbuf);
|
I2cStatus::ResponseBusy => false,
|
||||||
transaction.txlen = 1;
|
_ => {log::error!("try_send_i2c unhandled response: {:?}", status); false},
|
||||||
transaction.status = I2cStatus::RequestIncoming;
|
|
||||||
transaction.timeout_ms = I2C_TIMEOUT;
|
|
||||||
|
|
||||||
let rxbuf: [u8; llio::I2C_MAX_LEN] = [0; llio::I2C_MAX_LEN];
|
|
||||||
transaction.rxbuf = Some(rxbuf);
|
|
||||||
transaction.rxlen = data.len() as u32;
|
|
||||||
|
|
||||||
let mut sent = false;
|
|
||||||
while self.llio.poll_i2c_busy().unwrap() {
|
|
||||||
xous::yield_slice();
|
|
||||||
}
|
|
||||||
let mut retries = 0;
|
|
||||||
while !sent && retries < 4 {
|
|
||||||
match self.llio.send_i2c_request(transaction) {
|
|
||||||
Ok(status) => {
|
|
||||||
match status {
|
|
||||||
I2cStatus::ResponseInProgress => {
|
|
||||||
sent = true;
|
|
||||||
I2C_PENDING.store(true, Ordering::Relaxed);
|
|
||||||
},
|
|
||||||
I2cStatus::ResponseBusy => sent = false,
|
|
||||||
_ => {log::error!("try_send_i2c unhandled response"); return false;},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
_ => {log::error!("try_send_i2c unhandled error"); return false;}
|
|
||||||
}
|
}
|
||||||
retries += 1;
|
_ => {log::error!("try_send_i2c unhandled error"); false}
|
||||||
}
|
}
|
||||||
// block until completed
|
|
||||||
while I2C_PENDING.load(Ordering::Relaxed) {
|
|
||||||
xous::yield_slice();
|
|
||||||
}
|
|
||||||
|
|
||||||
for i in 0..I2C_READLEN.load(Ordering::Relaxed) as usize {
|
|
||||||
data[i] = I2C_READ[i].load(Ordering::Relaxed);
|
|
||||||
}
|
|
||||||
true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_headset_code(&mut self) -> u8 {
|
pub fn get_headset_code(&mut self) -> u8 {
|
||||||
|
|
|
||||||
|
|
@ -40,8 +40,7 @@ impl Into<u32> for UartType {
|
||||||
}
|
}
|
||||||
|
|
||||||
/////////////////////// I2C
|
/////////////////////// I2C
|
||||||
// TODO: change this to pub(crate) once we've gotten rid of legacy API
|
pub (crate) const I2C_MAX_LEN: usize = 33;
|
||||||
pub const I2C_MAX_LEN: usize = 33;
|
|
||||||
// a small book-keeping struct used to report back to I2C requestors as to the status of a transaction
|
// a small book-keeping struct used to report back to I2C requestors as to the status of a transaction
|
||||||
#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Eq, PartialEq)]
|
#[derive(Debug, Copy, Clone, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Eq, PartialEq)]
|
||||||
pub enum I2cStatus {
|
pub enum I2cStatus {
|
||||||
|
|
|
||||||
|
|
@ -124,13 +124,16 @@ impl I2cStateMachine {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn initiate(&mut self, transaction: I2cTransaction ) -> I2cStatus {
|
pub fn initiate(&mut self, transaction: I2cTransaction ) -> I2cStatus {
|
||||||
if !self.workqueue.is_empty() {
|
// state idle means the transaction is done
|
||||||
|
// listener None means any callback notifications are also done
|
||||||
|
// workqueue empty means, we have a clear path to do our thing
|
||||||
|
if self.workqueue.is_empty() && self.state == I2cState::Idle && self.listener == None {
|
||||||
|
self.checked_initiate(transaction)
|
||||||
|
} else {
|
||||||
match self.workqueue.enqueue(transaction) {
|
match self.workqueue.enqueue(transaction) {
|
||||||
Ok(_) => return I2cStatus::ResponseInProgress,
|
Ok(_) => return I2cStatus::ResponseInProgress,
|
||||||
_ => return I2cStatus::ResponseBusy,
|
_ => return I2cStatus::ResponseBusy,
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
self.checked_initiate(transaction)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -159,10 +162,12 @@ impl I2cStateMachine {
|
||||||
self.error = false;
|
self.error = false;
|
||||||
self.timestamp = now;
|
self.timestamp = now;
|
||||||
self.transaction = transaction.clone();
|
self.transaction = transaction.clone();
|
||||||
|
assert!(self.listener == None, "initiating when previous transaction is still in progress!");
|
||||||
match transaction.listener {
|
match transaction.listener {
|
||||||
None => self.listener = None,
|
None => self.listener = None,
|
||||||
Some((s0, s1, s2, s3)) => self.listener = Some(xous::SID::from_u32(s0, s1, s2, s3)),
|
Some((s0, s1, s2, s3)) => self.listener = Some(xous::SID::from_u32(s0, s1, s2, s3)),
|
||||||
}
|
}
|
||||||
|
log::trace!("initiate with listener {:?}", self.listener);
|
||||||
|
|
||||||
if self.transaction.status == I2cStatus::RequestIncoming {
|
if self.transaction.status == I2cStatus::RequestIncoming {
|
||||||
self.transaction.status = I2cStatus::ResponseInProgress;
|
self.transaction.status = I2cStatus::ResponseInProgress;
|
||||||
|
|
@ -206,10 +211,13 @@ impl I2cStateMachine {
|
||||||
|
|
||||||
fn i2c_followup(&mut self, trans: I2cTransaction) -> Result<(), xous::Error> {
|
fn i2c_followup(&mut self, trans: I2cTransaction) -> Result<(), xous::Error> {
|
||||||
if let Some(listener) = self.listener.take() {
|
if let Some(listener) = self.listener.take() {
|
||||||
|
log::trace!("followup to listener {:?}: {:?}", listener, trans);
|
||||||
let cid = xous::connect(listener).unwrap();
|
let cid = xous::connect(listener).unwrap();
|
||||||
let buf = xous_ipc::Buffer::into_buf(trans).or(Err(xous::Error::InternalError))?;
|
let buf = xous_ipc::Buffer::into_buf(trans).or(Err(xous::Error::InternalError))?;
|
||||||
buf.lend(cid, I2cCallback::Result.to_u32().unwrap()).map(|_|())?;
|
buf.lend(cid, I2cCallback::Result.to_u32().unwrap()).map(|_|())?;
|
||||||
unsafe{xous::disconnect(cid).unwrap()};
|
unsafe{xous::disconnect(cid).unwrap()};
|
||||||
|
} else {
|
||||||
|
log::trace!("completed with transaction, but no listener! {:?}", trans);
|
||||||
};
|
};
|
||||||
if let Some(work) = self.workqueue.dequeue() {
|
if let Some(work) = self.workqueue.dequeue() {
|
||||||
if self.checked_initiate(work) != I2cStatus::ResponseInProgress {
|
if self.checked_initiate(work) != I2cStatus::ResponseInProgress {
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,4 @@ pub use crate::backend::hosted::*;
|
||||||
#[cfg(target_os = "none")]
|
#[cfg(target_os = "none")]
|
||||||
mod hardware;
|
mod hardware;
|
||||||
#[cfg(target_os = "none")]
|
#[cfg(target_os = "none")]
|
||||||
pub use crate::i2c::hardware::*;
|
pub(crate) use crate::i2c::hardware::*;
|
||||||
|
|
|
||||||
|
|
@ -537,7 +537,7 @@ fn xmain() -> ! {
|
||||||
let gpio_base = crate::implementation::log_init();
|
let gpio_base = crate::implementation::log_init();
|
||||||
|
|
||||||
log_server::init_wait().unwrap();
|
log_server::init_wait().unwrap();
|
||||||
log::set_max_level(log::LevelFilter::Trace);
|
log::set_max_level(log::LevelFilter::Info);
|
||||||
info!("my PID is {}", xous::process::id());
|
info!("my PID is {}", xous::process::id());
|
||||||
|
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
|
|
|
||||||
|
|
@ -520,7 +520,7 @@ fn xmain() -> ! {
|
||||||
use crate::implementation::Rtc;
|
use crate::implementation::Rtc;
|
||||||
|
|
||||||
log_server::init_wait().unwrap();
|
log_server::init_wait().unwrap();
|
||||||
log::set_max_level(log::LevelFilter::Trace);
|
log::set_max_level(log::LevelFilter::Info);
|
||||||
log::info!("my PID is {}", xous::process::id());
|
log::info!("my PID is {}", xous::process::id());
|
||||||
|
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ impl Audio {
|
||||||
unsafe{ raw_header[i] = (*samples)[i] };
|
unsafe{ raw_header[i] = (*samples)[i] };
|
||||||
log::trace!("0x{:x}", raw_header[i]);
|
log::trace!("0x{:x}", raw_header[i]);
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
log::trace!("setting up audio stream");
|
log::trace!("setting up audio stream");
|
||||||
codec.setup_8k_stream().expect("couldn't set the CODEC to expected defaults");
|
codec.setup_8k_stream().expect("couldn't set the CODEC to expected defaults");
|
||||||
log::trace!("getting a callback ID");
|
log::trace!("getting a callback ID");
|
||||||
|
|
@ -39,7 +39,7 @@ impl Audio {
|
||||||
log::trace!("hooking frame callback");
|
log::trace!("hooking frame callback");
|
||||||
codec.hook_frame_callback(0xDEAD_BEEF, callback_conn).unwrap(); // any non-handled IDs get routed to our callback port
|
codec.hook_frame_callback(0xDEAD_BEEF, callback_conn).unwrap(); // any non-handled IDs get routed to our callback port
|
||||||
log::trace!("returning from setup");
|
log::trace!("returning from setup");
|
||||||
*/
|
|
||||||
Audio {
|
Audio {
|
||||||
codec,
|
codec,
|
||||||
sample,
|
sample,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue