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

Merge pull request #355 from thalesfragoso/dma-fences

Browse Source 
stm32: Add fences to DMA code
This commit is contained in:
Dario Nieuwenhuis 2021-08-11 13:28:57 +02:00 committed by GitHub
commit c310f18aaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
embassy-stm32/src/dma/bdma.rs
View File

@ -1,6 +1,7 @@
#![macro_use]
use core::future::Future;
use core::sync::atomic::{fence, Ordering};
use core::task::Poll;
use embassy::interrupt::{Interrupt, InterruptExt};
@ -61,6 +62,9 @@ pub(crate) unsafe fn do_transfer(
// Wait for the transfer to complete when it was ongoing.
while ch.cr().read().en() {}
// "Subsequent reads and writes cannot be moved ahead of preceding reads."
fence(Ordering::Acquire);
});
#[cfg(dmamux)]
@ -72,6 +76,9 @@ pub(crate) unsafe fn do_transfer(
.modify(|w| w.set_cs(channel_number as _, request))
});
// "Preceding reads and writes cannot be moved past subsequent writes."
fence(Ordering::Release);
ch.par().write_value(peri_addr as u32);
ch.mar().write_value(mem_addr as u32);
ch.ndtr().write(|w| w.set_ndt(mem_len as u16));

7
embassy-stm32/src/dma/dma.rs
View File

@ -1,4 +1,5 @@
use core::future::Future;
use core::sync::atomic::{fence, Ordering};
use core::task::Poll;
use embassy::interrupt::{Interrupt, InterruptExt};
@ -64,11 +65,17 @@ pub(crate) unsafe fn do_transfer(
// Wait for the transfer to complete when it was ongoing.
while ch.cr().read().en() {}
// "Subsequent reads and writes cannot be moved ahead of preceding reads."
fence(Ordering::Acquire);
});
#[cfg(dmamux)]
super::dmamux::configure_dmamux(dmamux_regs, dmamux_ch_num, request);
// "Preceding reads and writes cannot be moved past subsequent writes."
fence(Ordering::Release);
unsafe {
ch.par().write_value(peri_addr as u32);
ch.m0ar().write_value(mem_addr as u32);