nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-21 22:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

rp: wait until read matches for PSM accesses.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2024-05-27 00:11:13 +02:00
parent 33bdc9e85f
commit d18a919ab9
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
embassy-rp/src/lib.rs
View File

@ -383,25 +383,29 @@ unsafe fn pre_init() {
// //
// The PSM order is SIO -> PROC0 -> PROC1. // The PSM order is SIO -> PROC0 -> PROC1.
// So, we have to force-on PROC0 to prevent it from getting reset when resetting SIO. // So, we have to force-on PROC0 to prevent it from getting reset when resetting SIO.
pac::PSM.frce_on().write(|w| { pac::PSM.frce_on().write_and_wait(|w| {
w.set_proc0(true); w.set_proc0(true);
}); });
// Then reset SIO and PROC1. // Then reset SIO and PROC1.
pac::PSM.frce_off().write(|w| { pac::PSM.frce_off().write_and_wait(|w| {
w.set_sio(true); w.set_sio(true);
w.set_proc1(true); w.set_proc1(true);
}); });
// clear force_off first, force_on second. The other way around would reset PROC0. // clear force_off first, force_on second. The other way around would reset PROC0.
pac::PSM.frce_off().write(|_| {}); pac::PSM.frce_off().write_and_wait(|_| {});
pac::PSM.frce_on().write(|_| {}); pac::PSM.frce_on().write_and_wait(|_| {});
} }
/// Extension trait for PAC regs, adding atomic xor/bitset/bitclear writes. /// Extension trait for PAC regs, adding atomic xor/bitset/bitclear writes.
#[allow(unused)]
trait RegExt<T: Copy> { trait RegExt<T: Copy> {
#[allow(unused)] #[allow(unused)]
fn write_xor<R>(&self, f: impl FnOnce(&mut T) -> R) -> R; fn write_xor<R>(&self, f: impl FnOnce(&mut T) -> R) -> R;
fn write_set<R>(&self, f: impl FnOnce(&mut T) -> R) -> R; fn write_set<R>(&self, f: impl FnOnce(&mut T) -> R) -> R;
fn write_clear<R>(&self, f: impl FnOnce(&mut T) -> R) -> R; fn write_clear<R>(&self, f: impl FnOnce(&mut T) -> R) -> R;
fn write_and_wait<R>(&self, f: impl FnOnce(&mut T) -> R) -> R
where
T: PartialEq;
} }
impl<T: Default + Copy, A: pac::common::Write> RegExt<T> for pac::common::Reg<T, A> { impl<T: Default + Copy, A: pac::common::Write> RegExt<T> for pac::common::Reg<T, A> {
@ -434,4 +438,17 @@ impl<T: Default + Copy, A: pac::common::Write> RegExt<T> for pac::common::Reg<T,
} }
res res
} }
fn write_and_wait<R>(&self, f: impl FnOnce(&mut T) -> R) -> R
where
T: PartialEq,
{
let mut val = Default::default();
let res = f(&mut val);
unsafe {
self.as_ptr().write_volatile(val);
while self.as_ptr().read_volatile() != val {}
}
res
}
} }