Merge pull request #2002 from embassy-rs/fix-stop

stm32: fix stop

6 files changed, 40 insertions, 36 deletions

diff --git a/ci.sh b/ci.sh
index 7e688a51b..318c6cc0f 100755
--- a/ci.sh
+++ b/ci.sh
@@ -196,8 +196,9 @@ cargo batch  \
     --- build --release --manifest-path tests/riscv32/Cargo.toml --target riscv32imac-unknown-none-elf \
     $BUILD_EXTRA
 
-# temporarily disabled: broken by nightly update and/or clock settings update.
-rm out/tests/stm32f429zi/stop
+
+rm out/tests/stm32wb55rg/wpan_mac
+rm out/tests/stm32wb55rg/wpan_ble
 
 if [[ -z "${TELEPROBE_TOKEN-}" ]]; then
     echo No teleprobe token found, skipping running HIL tests
diff --git a/embassy-stm32/src/low_power.rs b/embassy-stm32/src/low_power.rs
index ce8afb578..bb714b8ca 100644
--- a/embassy-stm32/src/low_power.rs
+++ b/embassy-stm32/src/low_power.rs
@@ -1,6 +1,7 @@
 use core::arch::asm;
 use core::marker::PhantomData;
 
+use atomic_polyfill::{compiler_fence, Ordering};
 use cortex_m::peripheral::SCB;
 use embassy_executor::*;
 
@@ -67,10 +68,8 @@ impl Executor {
     }
 
     unsafe fn on_wakeup_irq(&mut self) {
-        trace!("low power: on wakeup irq");
-
         self.time_driver.resume_time();
-        trace!("low power: resume time");
+        trace!("low power: resume");
     }
 
     pub(self) fn stop_with_rtc(&mut self, rtc: &'static Rtc) {
@@ -82,21 +81,18 @@ impl Executor {
     }
 
     fn configure_pwr(&mut self) {
-        trace!("low power: configure_pwr");
-
         self.scb.clear_sleepdeep();
-        if !low_power_ready() {
-            trace!("low power: configure_pwr: low power not ready");
-            return;
-        }
 
-        if self.time_driver.pause_time().is_err() {
-            trace!("low power: configure_pwr: time driver failed to pause");
-            return;
-        }
+        compiler_fence(Ordering::SeqCst);
 
-        trace!("low power: enter stop...");
-        self.scb.set_sleepdeep();
+        if !low_power_ready() {
+            trace!("low power: not ready to stop");
+        } else if self.time_driver.pause_time().is_err() {
+            trace!("low power: failed to pause time");
+        } else {
+            trace!("low power: stop");
+            self.scb.set_sleepdeep();
+        }
     }
 
     /// Run the executor.
diff --git a/embassy-stm32/src/rcc/mod.rs b/embassy-stm32/src/rcc/mod.rs
index 9ccf2ac4f..ac9673833 100644
--- a/embassy-stm32/src/rcc/mod.rs
+++ b/embassy-stm32/src/rcc/mod.rs
@@ -111,8 +111,7 @@ static CLOCK_REFCOUNT: AtomicU32 = AtomicU32::new(0);
 
 #[cfg(feature = "low-power")]
 pub fn low_power_ready() -> bool {
-    trace!("clock refcount: {}", CLOCK_REFCOUNT.load(Ordering::SeqCst));
-
+    // trace!("clock refcount: {}", CLOCK_REFCOUNT.load(Ordering::SeqCst));
     CLOCK_REFCOUNT.load(Ordering::SeqCst) == 0
 }
 
diff --git a/embassy-stm32/src/rtc/v2.rs b/embassy-stm32/src/rtc/v2.rs
index 4608d3114..4974f6ee6 100644
--- a/embassy-stm32/src/rtc/v2.rs
+++ b/embassy-stm32/src/rtc/v2.rs
@@ -112,25 +112,26 @@ impl super::Rtc {
     pub(crate) fn stop_wakeup_alarm(&self, cs: critical_section::CriticalSection) -> Option<embassy_time::Duration> {
         use crate::interrupt::typelevel::Interrupt;
 
-        trace!("rtc: stop wakeup alarm at {}", self.instant());
+        if RTC::regs().cr().read().wute() {
+            trace!("rtc: stop wakeup alarm at {}", self.instant());
 
-        self.write(false, |regs| {
-            regs.cr().modify(|w| w.set_wutie(false));
-            regs.cr().modify(|w| w.set_wute(false));
-            regs.isr().modify(|w| w.set_wutf(false));
+            self.write(false, |regs| {
+                regs.cr().modify(|w| w.set_wutie(false));
+                regs.cr().modify(|w| w.set_wute(false));
+                regs.isr().modify(|w| w.set_wutf(false));
 
-            crate::pac::EXTI
-                .pr(0)
-                .modify(|w| w.set_line(RTC::EXTI_WAKEUP_LINE, true));
-
-            <RTC as crate::rtc::sealed::Instance>::WakeupInterrupt::unpend();
-        });
+                crate::pac::EXTI
+                    .pr(0)
+                    .modify(|w| w.set_line(RTC::EXTI_WAKEUP_LINE, true));
 
-        if let Some(stop_time) = self.stop_time.borrow(cs).take() {
-            Some(self.instant() - stop_time)
-        } else {
-            None
+                <RTC as crate::rtc::sealed::Instance>::WakeupInterrupt::unpend();
+            });
         }
+
+        self.stop_time
+            .borrow(cs)
+            .take()
+            .map(|stop_time| self.instant() - stop_time)
     }
 
     #[cfg(feature = "low-power")]
diff --git a/embassy-stm32/src/time_driver.rs b/embassy-stm32/src/time_driver.rs
index 5b01937f5..917502412 100644
--- a/embassy-stm32/src/time_driver.rs
+++ b/embassy-stm32/src/time_driver.rs
@@ -340,7 +340,11 @@ impl RtcDriver {
     #[cfg(feature = "low-power")]
     /// Set the rtc but panic if it's already been set
     pub(crate) fn set_rtc(&self, rtc: &'static Rtc) {
-        critical_section::with(|cs| assert!(self.rtc.borrow(cs).replace(Some(rtc)).is_none()));
+        critical_section::with(|cs| {
+            rtc.stop_wakeup_alarm(cs);
+
+            assert!(self.rtc.borrow(cs).replace(Some(rtc)).is_none())
+        });
     }
 
     #[cfg(feature = "low-power")]
diff --git a/tests/stm32/src/bin/stop.rs b/tests/stm32/src/bin/stop.rs
index 48d59b794..55c4aa900 100644
--- a/tests/stm32/src/bin/stop.rs
+++ b/tests/stm32/src/bin/stop.rs
@@ -14,6 +14,7 @@ use embassy_stm32::low_power::{stop_with_rtc, Executor};
 use embassy_stm32::rcc::RtcClockSource;
 use embassy_stm32::rtc::{Rtc, RtcConfig};
 use embassy_stm32::time::Hertz;
+use embassy_stm32::Config;
 use embassy_time::{Duration, Timer};
 use static_cell::make_static;
 
@@ -45,7 +46,9 @@ async fn task_2() {
 
 #[embassy_executor::task]
 async fn async_main(spawner: Spawner) {
-    let mut config = config();
+    let _ = config();
+
+    let mut config = Config::default();
 
     config.rcc.lse = Some(Hertz(32_768));
     config.rcc.rtc = Some(RtcClockSource::LSE);