kernel: ensure System Power Managment enables Tickless Idle.

mnkp · mnkp · commit 81b5e9b58d90 · 2018-11-21T23:46:41.000+01:00
System Power Management is only supported in Tickless Idle mode. This patch modifies Kconfig dependencies to ensure System Power Management option selects Tickless Idle one. Fixes: zephyrproject-rtos#11046 Signed-off-by: Piotr Mienkowski <piotr.mienkowski@gmail.com>
diff --git a/doc/subsystems/power_management.rst b/doc/subsystems/power_management.rst
@@ -92,9 +92,11 @@ System Power Management
 
 This consists of the hook functions that the power management subsystem calls
 when the kernel enters and exits the idle state, in other words, when the kernel
-has nothing to schedule. This section provides a general overview of the hook
-functions. Refer to :ref:`power_management_api` for the detailed description of
-the APIs.
+has nothing to schedule. Enabling system power management compels Zephyr kernel
+scheduler to work in tickless idle mode (see :option:`CONFIG_TICKLESS_IDLE`).
+
+This section provides a general overview of the hook functions. Refer to
+:ref:`power_management_api` for the detailed description of the APIs.
 
 Suspend Hook function
 =====================
diff --git a/kernel/Kconfig.power_mgmt b/kernel/Kconfig.power_mgmt
@@ -7,6 +7,7 @@
 
 menuconfig SYS_POWER_MANAGEMENT
 	bool "Power management"
+	select TICKLESS_IDLE
 	help
 	  This option enables the board to implement extra power management
 	  policies whenever the kernel becomes idle. The kernel informs the
@@ -59,6 +60,8 @@ config SYS_POWER_DEEP_SLEEP
 	  from the reset vector same as cold boot. The interface allows
 	  restoration of states that were saved at the time of suspend.
 
+endif # SYS_POWER_MANAGEMENT
+
 config DEVICE_POWER_MANAGEMENT
 	bool "Device power management"
 	help
@@ -69,5 +72,3 @@ config DEVICE_POWER_MANAGEMENT
 	  device drivers to do any necessary power management operations
 	  like turning off device clocks and peripherals. The device drivers
 	  may also save and restore states in these hook functions.
-
-endif
diff --git a/samples/boards/nrf52/power_mgr/prj.conf b/samples/boards/nrf52/power_mgr/prj.conf
@@ -2,5 +2,4 @@ CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_GPIO=y
diff --git a/samples/boards/nrf52/power_mgr/prj_tickless.conf b/samples/boards/nrf52/power_mgr/prj_tickless.conf
@@ -5,5 +5,4 @@ CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
 CONFIG_TICKLESS_KERNEL=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_GPIO=y
diff --git a/samples/boards/quark_se_c1000/power_mgr/prj.conf b/samples/boards/quark_se_c1000/power_mgr/prj.conf
@@ -2,6 +2,5 @@ CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_RTC=y
 CONFIG_GPIO=y
diff --git a/samples/boards/quark_se_c1000/power_mgr/prj_tickless.conf b/samples/boards/quark_se_c1000/power_mgr/prj_tickless.conf
@@ -4,13 +4,11 @@ CONFIG_NUM_COOP_PRIORITIES=29
 CONFIG_NUM_PREEMPT_PRIORITIES=40
 
 CONFIG_SYS_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_TICKLESS_KERNEL=y
 
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_RTC=y
 CONFIG_GPIO=y
diff --git a/samples/philosophers/prj_tickless.conf b/samples/philosophers/prj_tickless.conf
@@ -5,5 +5,4 @@ CONFIG_NUM_COOP_PRIORITIES=29
 CONFIG_NUM_PREEMPT_PRIORITIES=40
 
 CONFIG_SYS_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_TICKLESS_KERNEL=y
diff --git a/samples/subsys/power/power_mgr/prj.conf b/samples/subsys/power/power_mgr/prj.conf
@@ -2,7 +2,6 @@ CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 
 CONFIG_PM_CONTROL_OS=y
 CONFIG_PM_POLICY_RESIDENCY=y
diff --git a/samples/subsys/power/power_mgr/prj_tickless.conf b/samples/subsys/power/power_mgr/prj_tickless.conf
@@ -5,7 +5,6 @@ CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
 CONFIG_TICKLESS_KERNEL=y
-CONFIG_TICKLESS_IDLE=y
 
 CONFIG_PM_CONTROL_OS=y
 CONFIG_PM_POLICY_RESIDENCY=y
diff --git a/tests/kernel/profiling/profiling_api/prj.conf b/tests/kernel/profiling/profiling_api/prj.conf
@@ -8,7 +8,6 @@ CONFIG_TEST_HW_STACK_PROTECTION=n
 # to check idle thread
 CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_IDLE_STACK_SIZE=512
 
 # to check isr
diff --git a/tests/kernel/tickless/tickless_concept/prj.conf b/tests/kernel/tickless/tickless_concept/prj.conf
@@ -1,4 +1,3 @@
 CONFIG_ZTEST=y
 CONFIG_SYS_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_TICKLESS_IDLE_THRESH=20
diff --git a/tests/power/multicore/arc/prj.conf b/tests/power/multicore/arc/prj.conf
@@ -3,7 +3,6 @@ CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_0"
 CONFIG_IPM=y
 CONFIG_IPM_QUARK_SE=y
diff --git a/tests/power/multicore/lmt/prj.conf b/tests/power/multicore/lmt/prj.conf
@@ -3,7 +3,6 @@ CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_ARC_INIT=y
 CONFIG_RTC=y
 CONFIG_IPM=y
diff --git a/tests/power/power_states/prj.conf b/tests/power/power_states/prj.conf
@@ -3,7 +3,6 @@ CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 
 # RTC Wake Event
 CONFIG_RTC=y
diff --git a/tests/power/power_states/prj_tickless.conf b/tests/power/power_states/prj_tickless.conf
@@ -2,7 +2,6 @@ CONFIG_SYS_POWER_MANAGEMENT=y
 CONFIG_SYS_POWER_LOW_POWER_STATE=y
 CONFIG_SYS_POWER_DEEP_SLEEP=y
 CONFIG_DEVICE_POWER_MANAGEMENT=y
-CONFIG_TICKLESS_IDLE=y
 CONFIG_TICKLESS_KERNEL=y
 CONFIG_RTC=y
 CONFIG_GPIO=y
