Skip to content

embassy-nrf/twim: prevent extra STOPs on ERROR #6726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wassasin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

embassy-nrf/twim: prevent extra STOPs on ERROR #6726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions embassy-nrf/src/twim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,28 @@ impl<T: Instance> interrupt::typelevel::Handler<T::Interrupt> for InterruptHandl
let r = T::regs();
let s = T::state();

if r.events_suspended().read() != 0 {
let suspended = r.events_suspended().read() != 0;
let stopped = r.events_stopped().read() != 0;
let error = r.events_error().read() != 0;

if suspended {
s.end_waker.wake();
r.intenclr().write(|w| w.set_suspended(true));
}
if r.events_stopped().read() != 0 {
if stopped {
s.end_waker.wake();
r.intenclr().write(|w| w.set_stopped(true));
}
if r.events_error().read() != 0 {
s.end_waker.wake();

// On error, instead of waking we will first issue a STOP (if it hasn't been issued yet).
if error {
r.intenclr().write(|w| w.set_error(true));

// Explicitly issue a STOP if an error has occurred which has not yet resulted in a STOP.
// This can happen with for example an ANACK.
if !stopped {
r.tasks_stop().write_value(1);
}
}
}
}
Expand Down Expand Up @@ -356,28 +367,16 @@ impl<'d> Twim<'d> {
Ok(())
}

/// Wait for stop or error
async fn async_wait(&mut self) -> Result<(), Error> {
/// Wait for suspend or stop
async fn async_wait(&mut self) {
poll_fn(|cx| {
let r = self.r;
let s = self.state;

s.end_waker.register(cx.waker());
if r.events_suspended().read() != 0 || r.events_stopped().read() != 0 {
r.events_stopped().write_value(0);

return Poll::Ready(Ok(()));
}

// stop if an error occurred
if r.events_error().read() != 0 {
r.events_error().write_value(0);
r.tasks_stop().write_value(1);
if let Err(e) = self.check_errorsrc() {
return Poll::Ready(Err(e));
} else {
return Poll::Ready(Err(Error::Timeout));
}
// Events are cleared when setting up the next operation.
return Poll::Ready(());
}

Poll::Pending
Expand Down Expand Up @@ -618,7 +617,7 @@ impl<'d> Twim<'d> {
while !operations.is_empty() {
let ops = self.setup_operations(address, operations, last_op, true)?;
let (in_progress, rest) = operations.split_at_mut(ops);
self.async_wait().await?;
self.async_wait().await;
self.check_operations(in_progress)?;
last_op = in_progress.last();
operations = rest;
Expand Down