stm32wbax pm reworked to support STOP/STDBY mode without SCM

Power management has been split between
BLE HCI driver and system.
Power management has been reworked to remove dependency on
ST system clock manager (SCM) module.

Signed-off-by: Alessandro Manganaro <[email protected]>

Author: asm5878

lib/stm32wba/BLE_TransparentMode/Core/Inc/app_conf.h

@@ -370,7 +370,7 @@ typedef enum
  * System Clock Manager module configuration
  ******************************************************************************/
 
-#define CFG_SCM_SUPPORTED                   (1)
+#define CFG_SCM_SUPPORTED                   (0)
 
 /******************************************************************************
  * HW RADIO configuration

lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/linklayer_plat.c

@@ -26,7 +26,7 @@
 #include "app_common.h"
 #include "app_conf.h"
 #include "linklayer_plat.h"
-#include "scm.h"
+
 #include "log_module.h"
 #ifndef __ZEPHYR__
 #if (USE_TEMPERATURE_BASED_RADIO_CALIBRATION == 1)
@@ -36,14 +36,8 @@
 #include "stm32_lpm.h"
 #include "stm32_lpm_if.h"
 #endif /* (CFG_LPM_LEVEL != 0) */
+#endif
 
-/* USER CODE BEGIN Includes */
-
-/* USER CODE END Includes */
-
-#else
-#include "scm.h"
-#endif /* __ZEPHYR__ */
 
 #ifndef __ZEPHYR__
 #define max(a,b) ((a) > (b) ? a : b)
@@ -457,9 +451,6 @@ void LINKLAYER_PLAT_StartRadioEvt(void)
 {
   __HAL_RCC_RADIO_CLK_SLEEP_ENABLE();
   NVIC_SetPriority(RADIO_INTR_NUM, RADIO_INTR_PRIO_HIGH);
-#if (CFG_SCM_SUPPORTED == 1)
-  scm_notifyradiostate(SCM_RADIO_ACTIVE);
-#endif /* CFG_SCM_SUPPORTED */
 }
 
 /**
@@ -471,9 +462,6 @@ void LINKLAYER_PLAT_StopRadioEvt(void)
 {
   __HAL_RCC_RADIO_CLK_SLEEP_DISABLE();
   NVIC_SetPriority(RADIO_INTR_NUM, RADIO_INTR_PRIO_LOW);
-#if (CFG_SCM_SUPPORTED == 1)
-  scm_notifyradiostate(SCM_RADIO_NOT_ACTIVE);
-#endif /* CFG_SCM_SUPPORTED */
 }
 
 /**
@@ -488,10 +476,6 @@ void LINKLAYER_PLAT_RCOStartClbr(void)
   /* Disabling stop mode prevents also from entering in standby */
   UTIL_LPM_SetStopMode(1U << CFG_LPM_LL_HW_RCO_CLBR, UTIL_LPM_DISABLE);
 #endif /* (CFG_LPM_LEVEL != 0) */
-#if (CFG_SCM_SUPPORTED == 1)
-  scm_setsystemclock(SCM_USER_LL_HW_RCO_CLBR, HSE_32MHZ);
-  while (LL_PWR_IsActiveFlag_VOS() == 0);
-#endif /* (CFG_SCM_SUPPORTED == 1) */
 }
 
 /**
@@ -505,10 +489,6 @@ void LINKLAYER_PLAT_RCOStopClbr(void)
   PWR_EnableSleepMode();
   UTIL_LPM_SetStopMode(1U << CFG_LPM_LL_HW_RCO_CLBR, UTIL_LPM_ENABLE);
 #endif /* (CFG_LPM_LEVEL != 0) */
-#if (CFG_SCM_SUPPORTED == 1)
-  scm_setsystemclock(SCM_USER_LL_HW_RCO_CLBR, HSE_16MHZ);
-  while (LL_PWR_IsActiveFlag_VOS() == 0);
-#endif /* (CFG_SCM_SUPPORTED == 1) */
 }
 #endif /*__ZEPHYR__*/
 

lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/ll_sys_if.c

@@ -289,6 +289,10 @@ void ll_sys_reset(void)
 #if defined(__GNUC__) && defined(DEBUG)
     drift_time += DRIFT_TIME_EXTRA_GCC_DEBUG;
     exec_time += EXEC_TIME_EXTRA_GCC_DEBUG;
+#endif
+#if defined (__ZEPHYR__)
+    drift_time += DRIFT_TIME_EXTRA_ZEPHYR;
+    exec_time += EXEC_TIME_EXTRA_ZEPHYR;
 #endif
   }
 

lib/stm32wba/BLE_TransparentMode/STM32_WPAN/Target/ll_sys_if.h

@@ -42,10 +42,16 @@ extern "C" {
 #define DRIFT_TIME_DEFAULT                      (13)
 #define DRIFT_TIME_EXTRA_LSI2                   (9)
 #define DRIFT_TIME_EXTRA_GCC_DEBUG              (6)
+#ifdef __ZEPHYR__
+#define DRIFT_TIME_EXTRA_ZEPHYR                 (15)
+#endif
 
 #define EXEC_TIME_DEFAULT                       (10)
 #define EXEC_TIME_EXTRA_LSI2                    (3)
 #define EXEC_TIME_EXTRA_GCC_DEBUG               (4)
+#ifdef __ZEPHYR__
+#define EXEC_TIME_EXTRA_ZEPHYR                  (15)
+#endif
 
 #define SCHDL_TIME_DEFAULT                      (20)
 /* USER CODE BEGIN EC */

lib/stm32wba/CMakeLists.txt

@@ -31,7 +31,6 @@ zephyr_sources(BLE_TransparentMode/STM32_WPAN/Target/power_table.c)
 zephyr_sources(Common/WPAN/Modules/Log/log_module.c)
 zephyr_sources(Common/WPAN/Interfaces/hw_pka.c)
 zephyr_sources(Common/WPAN/Interfaces/hw_pka_p256.c)
-zephyr_sources(Common/WPAN/Modules/scm.c)
 zephyr_sources(Common/WPAN/Modules/RTDebug/RTDebug.c)
 zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_cs.c)
 zephyr_sources(STM32_WPAN/link_layer/ll_sys/src/ll_sys_dp_slp.c)