Skip to content

stm32/spi: Clear interrupt flags when starting ringbuffer #6738

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
msrd0 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −1
Open

stm32/spi: Clear interrupt flags when starting ringbuffer #6738

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
19 changes: 18 additions & 1 deletion embassy-stm32/src/spi/ringbuffered.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use embassy_embedded_hal::SetConfig;
use embassy_hal_internal::Peri;
use embedded_io_async::ReadReady;
use futures_util::future::select;
use stm32_metapac::spi::regs;

use super::mode::Slave;
use super::{Config, Error, Info, RegsExt, Spi, Word, check_error_flags, reconfigure, set_rxdmaen};
Expand Down Expand Up @@ -185,12 +186,28 @@ impl<'d, W: Word> RingBufferedSpiRx<'d, W> {
self.ring_buf.clear();
}

#[cfg(not(any(spi_v4, spi_v5, spi_v6)))]
fn clear_interrupt_flags(&mut self, _sr: regs::Sr) {}

#[cfg(any(spi_v4, spi_v5, spi_v6))]
fn clear_interrupt_flags(&mut self, sr: regs::Sr) {
#[cfg(spi_v4)]
let mask = 0xFF4;
#[cfg(any(spi_v5, spi_v6))]
let mask = 0xBF4;

let r = self.info.regs;
r.ifcr().write(|w| *w = regs::Ifcr(sr.0 & mask));
}

/// (Re-)start DMA and SPI if it is not running (has not been started yet or has failed), and
/// check for errors in status register. Error flags are checked/cleared first.
fn start_or_check_errors(&mut self) -> Result<(), Error> {
let r = self.info.regs;

check_error_flags(r.sr().read(), true)?;
let sr = r.sr().read();
self.clear_interrupt_flags(sr);
check_error_flags(sr, true)?;

if !self.ring_buf.is_running() {
self.start();
Expand Down