From 66d70cd146b44a2b3115d306cc9a785d84b45288 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Sat, 16 Oct 2021 03:14:47 +0200
Subject: [PATCH 1/2] nrf/uarte: do not use WFE on drop.
- It disturbs other stuff that uses WFE/SEV in the system. I ran into
issues with this.
- It needs the irq handler to check for RXTO/TXSTOPPED errors, which makes
it slower.
---
embassy-nrf/src/uarte.rs | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/embassy-nrf/src/uarte.rs b/embassy-nrf/src/uarte.rs
index 024a86c91..63bbe5a77 100644
--- a/embassy-nrf/src/uarte.rs
+++ b/embassy-nrf/src/uarte.rs
@@ -187,13 +187,6 @@ impl<'d, T: Instance> Uarte<'d, T> {
s.endtx_waker.wake();
r.intenclr.write(|w| w.endtx().clear());
}
-
- if r.events_rxto.read().bits() != 0 {
- r.intenclr.write(|w| w.rxto().clear());
- }
- if r.events_txstopped.read().bits() != 0 {
- r.intenclr.write(|w| w.txstopped().clear());
- }
}
}
@@ -208,15 +201,9 @@ impl<'a, T: Instance> Drop for Uarte<'a, T> {
info!("did_stoprx {} did_stoptx {}", did_stoprx, did_stoptx);
// Wait for rxto or txstopped, if needed.
- r.intenset.write(|w| w.rxto().set().txstopped().set());
while (did_stoprx && r.events_rxto.read().bits() == 0)
|| (did_stoptx && r.events_txstopped.read().bits() == 0)
- {
- info!("uarte drop: wfe");
- cortex_m::asm::wfe();
- }
-
- cortex_m::asm::sev();
+ {}
// Finally we can disable!
r.enable.write(|w| w.enable().disabled());
From 4c0fa03c14b95726e4107a65e54601e07d6653ae Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Sat, 16 Oct 2021 04:11:19 +0200
Subject: [PATCH 2/2] interrupt: transmute instead of steal.
That steal method has a TAKEN=true write [here](https://github.com/rust-embedded/cortex-m/blob/6b013138b734b9bbeb24a345f75d2bcc1c69fa8d/src/peripheral/mod.rs#L180).
This is not zero cost, we don't want it. Transmute instead, which is zero cost.
---
embassy/src/interrupt.rs | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/embassy/src/interrupt.rs b/embassy/src/interrupt.rs
index df3a79ccc..7848ee698 100644
--- a/embassy/src/interrupt.rs
+++ b/embassy/src/interrupt.rs
@@ -1,8 +1,8 @@
+use atomic_polyfill::{compiler_fence, AtomicPtr, Ordering};
+use core::mem;
use core::ptr;
use cortex_m::peripheral::NVIC;
-use atomic_polyfill::{compiler_fence, AtomicPtr, Ordering};
-
pub use embassy_macros::interrupt_declare as declare;
pub use embassy_macros::interrupt_take as take;
@@ -124,9 +124,8 @@ impl<T: Interrupt + ?Sized> InterruptExt for T {
#[inline]
fn set_priority(&self, prio: Self::Priority) {
unsafe {
- cortex_m::peripheral::Peripherals::steal()
- .NVIC
- .set_priority(NrWrap(self.number()), prio.into())
+ let mut nvic: cortex_m::peripheral::NVIC = mem::transmute(());
+ nvic.set_priority(NrWrap(self.number()), prio.into())
}
}
}