[Telink] Ability to disable/enable PM during BLE operation (#25769)

* [Telink] Remove tlsr9518adk80d.overlay * [Telink] Ability to disable Zephyr PM during BLE
project-chip · Mar 24, 2023 · bfc3000 · bfc3000
1 parent 320da37
commit bfc3000
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 9 deletions.
diff --git a/config/telink/chip-module/Kconfig b/config/telink/chip-module/Kconfig
@@ -162,3 +162,9 @@ config CHIP_ENABLE_APPLICATION_STATUS_LED
 	default y
 	help
 	  Enable application status LED.
+
+config CHIP_ENABLE_PM_DURING_BLE
+	bool "Enable PM during BLE operation"
+	default y
+	help
+	  Enable PM during BLE operation.
diff --git a/examples/all-clusters-app/telink/prj.conf b/examples/all-clusters-app/telink/prj.conf
@@ -72,3 +72,4 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/contact-sensor-app/telink/boards/tlsr9518adk80d.overlay b/examples/contact-sensor-app/telink/boards/tlsr9518adk80d.overlay
diff --git a/examples/contact-sensor-app/telink/prj.conf b/examples/contact-sensor-app/telink/prj.conf
@@ -72,3 +72,4 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/light-switch-app/telink/boards/tlsr9518adk80d.overlay b/examples/light-switch-app/telink/boards/tlsr9518adk80d.overlay
diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf
@@ -73,3 +73,4 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
@@ -73,6 +73,7 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
 
 # Custom RF power values
 CONFIG_B91_BLE_CTRL_RF_POWER_P9P11DBM=y

diff --git a/examples/lock-app/telink/prj.conf b/examples/lock-app/telink/prj.conf
@@ -72,3 +72,4 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/ota-requestor-app/telink/prj.conf b/examples/ota-requestor-app/telink/prj.conf
@@ -66,3 +66,4 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/pump-app/telink/prj.conf b/examples/pump-app/telink/prj.conf
@@ -72,3 +72,4 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/pump-controller-app/telink/prj.conf b/examples/pump-controller-app/telink/prj.conf
@@ -72,3 +72,4 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/temperature-measurement-app/telink/prj.conf b/examples/temperature-measurement-app/telink/prj.conf
@@ -73,6 +73,7 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
 
 # Custom RF power values
 CONFIG_B91_BLE_CTRL_RF_POWER_P9P11DBM=y

diff --git a/examples/thermostat/telink/boards/tlsr9518adk80d.overlay b/examples/thermostat/telink/boards/tlsr9518adk80d.overlay
diff --git a/examples/thermostat/telink/prj.conf b/examples/thermostat/telink/prj.conf
@@ -73,3 +73,4 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
diff --git a/examples/window-app/telink/prj.conf b/examples/window-app/telink/prj.conf
@@ -72,6 +72,7 @@ CONFIG_CHIP_ENABLE_APPLICATION_STATUS_LED=y
 # Enable Power Management
 CONFIG_PM=n
 CONFIG_PM_DEVICE=n
+CONFIG_CHIP_ENABLE_PM_DURING_BLE=n
 
 # Custom RF power values
 CONFIG_B91_BLE_CTRL_RF_POWER_P9P11DBM=y

diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp
@@ -43,6 +43,10 @@
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
 
+#if defined(CONFIG_PM) && !defined(CONFIG_CHIP_ENABLE_PM_DURING_BLE)
+#include <zephyr/pm/policy.h>
+#endif
+
 #include <array>
 
 // Includes for ieee802154 switchings
@@ -316,6 +320,9 @@ CHIP_ERROR BLEManagerImpl::StartAdvertising(void)
         VerifyOrReturnError(err == 0, MapErrorZephyr(err));
         (void) bt_set_name(bt_dev_name);
         BLERadioInitialized = true;
+#if defined(CONFIG_PM) && !defined(CONFIG_CHIP_ENABLE_PM_DURING_BLE)
+        pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
+#endif
     }
 
     // Prepare advertising request
@@ -959,6 +966,10 @@ void BLEManagerImpl::SwitchToIeee802154(void)
     // irq_disable(IRQ1_SYSTIMER);
     BLERadioInitialized = false;
 
+#if defined(CONFIG_PM) && !defined(CONFIG_CHIP_ENABLE_PM_DURING_BLE)
+    pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);
+#endif
+
     const struct device * radio_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_ieee802154));
     __ASSERT(radio_dev != NULL, "Get radio_dev fail");