4 files changed, 40 insertions, 19 deletions

diff --git a/embassy-stm32/src/low_power.rs b/embassy-stm32/src/low_power.rs
index 02116e08a..71befcf34 100644
--- a/embassy-stm32/src/low_power.rs
+++ b/embassy-stm32/src/low_power.rs
@@ -136,10 +136,10 @@ pub fn stop_ready(stop_mode: StopMode) -> bool {
     })
 }
 
-#[cfg(any(stm32l4, stm32l5, stm32u5, stm32wba, stm32wb, stm32wlex, stm32u0))]
+#[cfg(any(stm32l4, stm32l5, stm32u5, stm32wba, stm32wb, stm32wl, stm32u0))]
 use crate::pac::pwr::vals::Lpms;
 
-#[cfg(any(stm32l4, stm32l5, stm32u5, stm32wba, stm32wb, stm32wlex, stm32u0))]
+#[cfg(any(stm32l4, stm32l5, stm32u5, stm32wba, stm32wb, stm32wl, stm32u0))]
 impl Into<Lpms> for StopMode {
     fn into(self) -> Lpms {
         match self {
@@ -184,19 +184,28 @@ impl Executor {
 
     pub(crate) unsafe fn on_wakeup_irq_or_event() {
         if !get_driver().is_stopped() {
+            trace!("low power: time driver not stopped!");
             return;
         }
 
         critical_section::with(|cs| {
-            #[cfg(any(stm32wlex, stm32wb))]
+            #[cfg(any(stm32wl, stm32wb))]
             {
                 let es = crate::pac::PWR.extscr().read();
-                #[cfg(stm32wlex)]
+                #[cfg(stm32wl)]
                 match (es.c1stopf(), es.c1stop2f()) {
-                    (true, false) => debug!("low power: wake from STOP1"),
-                    (false, true) => debug!("low power: wake from STOP2"),
-                    (true, true) => debug!("low power: wake from STOP1 and STOP2 ???"),
-                    (false, false) => trace!("low power: stop mode not entered"),
+                    (true, false) => debug!("low power: cpu1 wake from STOP1"),
+                    (false, true) => debug!("low power: cpu1 wake from STOP2"),
+                    (true, true) => debug!("low power: cpu1 wake from STOP1 and STOP2 ???"),
+                    (false, false) => trace!("low power: cpu1 stop mode not entered"),
+                };
+                #[cfg(stm32wl5x)]
+                // TODO: only for the current cpu
+                match (es.c2stopf(), es.c2stop2f()) {
+                    (true, false) => debug!("low power: cpu2 wake from STOP1"),
+                    (false, true) => debug!("low power: cpu2 wake from STOP2"),
+                    (true, true) => debug!("low power: cpu2 wake from STOP1 and STOP2 ???"),
+                    (false, false) => trace!("low power: cpu2 stop mode not entered"),
                 };
 
                 #[cfg(stm32wb)]
@@ -206,9 +215,6 @@ impl Executor {
                     (true, true) => debug!("low power: cpu1 and cpu2 wake from STOP"),
                     (false, false) => trace!("low power: stop mode not entered"),
                 };
-                crate::pac::PWR.extscr().modify(|w| {
-                    w.set_c1cssf(false);
-                });
 
                 let _has_stopped2 = {
                     #[cfg(stm32wb)]
@@ -220,6 +226,12 @@ impl Executor {
                     {
                         es.c1stop2f()
                     }
+
+                    #[cfg(stm32wl5x)]
+                    {
+                        // TODO: I think we could just use c1stop2f() here as it won't enter a stop mode unless BOTH cpus will enter it.
+                        es.c1stop2f() | es.c2stop2f()
+                    }
                 };
 
                 #[cfg(not(stm32wb))]
@@ -235,6 +247,13 @@ impl Executor {
                         REFCOUNT_STOP1 = 0;
                     }
                 }
+                // Clear all stop flags
+                #[cfg(stm32wl)]
+                crate::pac::PWR.extscr().modify(|w| {
+                    w.set_c1cssf(true);
+                    #[cfg(stm32wl5x)]
+                    w.set_c2cssf(true);
+                });
             }
             get_driver().resume_time(cs);
 
@@ -337,7 +356,7 @@ impl Executor {
         #[cfg(all(stm32wb, feature = "low-power"))]
         self.configure_stop_stm32wb(_cs)?;
 
-        #[cfg(any(stm32l4, stm32l5, stm32u5, stm32u0, stm32wb, stm32wba, stm32wlex))]
+        #[cfg(any(stm32l4, stm32l5, stm32u5, stm32u0, stm32wb, stm32wba, stm32wl))]
         crate::pac::PWR.cr1().modify(|m| m.set_lpms(stop_mode.into()));
         #[cfg(stm32h5)]
         crate::pac::PWR.pmcr().modify(|v| {
@@ -352,9 +371,11 @@ impl Executor {
     fn configure_pwr(&self) {
         Self::get_scb().clear_sleepdeep();
         // Clear any previous stop flags
-        #[cfg(stm32wlex)]
+        #[cfg(stm32wl)]
         crate::pac::PWR.extscr().modify(|w| {
             w.set_c1cssf(true);
+            #[cfg(stm32wl5x)]
+            w.set_c2cssf(true);
         });
 
         #[cfg(feature = "low-power-pender")]
diff --git a/embassy-stm32/src/rcc/mod.rs b/embassy-stm32/src/rcc/mod.rs
index 753ee1290..c0a50615e 100644
--- a/embassy-stm32/src/rcc/mod.rs
+++ b/embassy-stm32/src/rcc/mod.rs
@@ -313,7 +313,7 @@ impl RccInfo {
 
     #[allow(dead_code)]
     fn increment_minimum_stop_refcount_with_cs(&self, _cs: CriticalSection) {
-        #[cfg(all(any(stm32wlex, stm32wb), feature = "low-power"))]
+        #[cfg(all(any(stm32wl, stm32wb), feature = "low-power"))]
         match self.stop_mode {
             StopMode::Stop1 | StopMode::Stop2 => increment_stop_refcount(_cs, StopMode::Stop2),
             _ => {}
@@ -334,7 +334,7 @@ impl RccInfo {
 
     #[allow(dead_code)]
     fn decrement_minimum_stop_refcount_with_cs(&self, _cs: CriticalSection) {
-        #[cfg(all(any(stm32wlex, stm32wb), feature = "low-power"))]
+        #[cfg(all(any(stm32wl, stm32wb), feature = "low-power"))]
         match self.stop_mode {
             StopMode::Stop1 | StopMode::Stop2 => decrement_stop_refcount(_cs, StopMode::Stop2),
             _ => {}
diff --git a/embassy-stm32/src/rtc/low_power.rs b/embassy-stm32/src/rtc/low_power.rs
index cd5cea081..e15eddc22 100644
--- a/embassy-stm32/src/rtc/low_power.rs
+++ b/embassy-stm32/src/rtc/low_power.rs
@@ -114,11 +114,11 @@ impl Rtc {
             use crate::pac::EXTI;
             EXTI.rtsr(0).modify(|w| w.set_line(RTC::EXTI_WAKEUP_LINE, true));
 
-            #[cfg(not(stm32wb))]
+            #[cfg(not(any(stm32wb, stm32wl5x)))]
             {
                 EXTI.imr(0).modify(|w| w.set_line(RTC::EXTI_WAKEUP_LINE, true));
             }
-            #[cfg(stm32wb)]
+            #[cfg(any(stm32wb, stm32wl5x))]
             {
                 EXTI.cpu(0).imr(0).modify(|w| w.set_line(RTC::EXTI_WAKEUP_LINE, true));
             }
diff --git a/embassy-stm32/src/rtc/v3.rs b/embassy-stm32/src/rtc/v3.rs
index f7ebea73e..49c9778df 100644
--- a/embassy-stm32/src/rtc/v3.rs
+++ b/embassy-stm32/src/rtc/v3.rs
@@ -131,7 +131,7 @@ impl SealedInstance for crate::peripherals::RTC {
 
     #[cfg(feature = "low-power")]
     cfg_if::cfg_if!(
-        if #[cfg(any(stm32g4, stm32wlex))] {
+        if #[cfg(any(stm32g4, stm32wl))] {
             const EXTI_WAKEUP_LINE: usize = 20;
         } else if #[cfg(stm32g0)] {
             const EXTI_WAKEUP_LINE: usize = 19;
@@ -142,7 +142,7 @@ impl SealedInstance for crate::peripherals::RTC {
 
     #[cfg(feature = "low-power")]
     cfg_if::cfg_if!(
-        if #[cfg(any(stm32g4, stm32wlex))] {
+        if #[cfg(any(stm32g4, stm32wl))] {
             type WakeupInterrupt = crate::interrupt::typelevel::RTC_WKUP;
         } else if #[cfg(any(stm32g0, stm32u0))] {
             type WakeupInterrupt = crate::interrupt::typelevel::RTC_TAMP;