max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2245 from peter9477/nrf52-qspi-zerolen-fix

Browse Source 
nrf52/qspi: avoid infinite busy-wait read/write with zero-len buf
This commit is contained in:
Dario Nieuwenhuis 2023-12-03 23:21:32 +01:00 committed by GitHub
commit 521cdef8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
embassy-nrf/src/qspi.rs Normal file → Executable file
View File

@ -391,8 +391,13 @@ impl<'d, T: Instance> Qspi<'d, T> {
/// ///
/// The difference with `read` is that this does not do bounds checks /// The difference with `read` is that this does not do bounds checks
/// against the flash capacity. It is intended for use when QSPI is used as /// against the flash capacity. It is intended for use when QSPI is used as
/// a raw bus, not with flash memory. /// a raw bus, not with flash memory.
pub async fn read_raw(&mut self, address: u32, data: &mut [u8]) -> Result<(), Error> { pub async fn read_raw(&mut self, address: u32, data: &mut [u8]) -> Result<(), Error> {
// Avoid blocking_wait_ready() blocking forever on zero-length buffers.
if data.len() == 0 {
return Ok(());
}
let ondrop = OnDrop::new(Self::blocking_wait_ready); let ondrop = OnDrop::new(Self::blocking_wait_ready);
self.start_read(address, data)?; self.start_read(address, data)?;
@ -409,6 +414,11 @@ impl<'d, T: Instance> Qspi<'d, T> {
/// against the flash capacity. It is intended for use when QSPI is used as /// against the flash capacity. It is intended for use when QSPI is used as
/// a raw bus, not with flash memory. /// a raw bus, not with flash memory.
pub async fn write_raw(&mut self, address: u32, data: &[u8]) -> Result<(), Error> { pub async fn write_raw(&mut self, address: u32, data: &[u8]) -> Result<(), Error> {
// Avoid blocking_wait_ready() blocking forever on zero-length buffers.
if data.len() == 0 {
return Ok(());
}
let ondrop = OnDrop::new(Self::blocking_wait_ready); let ondrop = OnDrop::new(Self::blocking_wait_ready);
self.start_write(address, data)?; self.start_write(address, data)?;
@ -425,6 +435,11 @@ impl<'d, T: Instance> Qspi<'d, T> {
/// against the flash capacity. It is intended for use when QSPI is used as /// against the flash capacity. It is intended for use when QSPI is used as
/// a raw bus, not with flash memory. /// a raw bus, not with flash memory.
pub fn blocking_read_raw(&mut self, address: u32, data: &mut [u8]) -> Result<(), Error> { pub fn blocking_read_raw(&mut self, address: u32, data: &mut [u8]) -> Result<(), Error> {
// Avoid blocking_wait_ready() blocking forever on zero-length buffers.
if data.len() == 0 {
return Ok(());
}
self.start_read(address, data)?; self.start_read(address, data)?;
Self::blocking_wait_ready(); Self::blocking_wait_ready();
Ok(()) Ok(())
@ -436,6 +451,11 @@ impl<'d, T: Instance> Qspi<'d, T> {
/// against the flash capacity. It is intended for use when QSPI is used as /// against the flash capacity. It is intended for use when QSPI is used as
/// a raw bus, not with flash memory. /// a raw bus, not with flash memory.
pub fn blocking_write_raw(&mut self, address: u32, data: &[u8]) -> Result<(), Error> { pub fn blocking_write_raw(&mut self, address: u32, data: &[u8]) -> Result<(), Error> {
// Avoid blocking_wait_ready() blocking forever on zero-length buffers.
if data.len() == 0 {
return Ok(());
}
self.start_write(address, data)?; self.start_write(address, data)?;
Self::blocking_wait_ready(); Self::blocking_wait_ready();
Ok(()) Ok(())