From: Jeson Gao Date: Fri, 7 Mar 2025 13:23:49 +0000 (+0000) Subject: PM: EM: Rework the depends on for CONFIG_ENERGY_MODEL X-Git-Tag: v6.15-rc1~191^2~2^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17f08280cf89baf5e4620fc7af300082bcee7e24;p=thirdparty%2Fkernel%2Flinux.git PM: EM: Rework the depends on for CONFIG_ENERGY_MODEL Now not only CPUs can use energy efficiency models, but GPUs can also use. On the other hand, even with only one CPU, we can also use energy_model to align control in thermal. So remove the dependence of SMP, and add the DEVFREQ. Signed-off-by: Jeson Gao [Added missing SMP config option in DTPM_CPU dependency] Signed-off-by: Lukasz Luba Link: https://patch.msgid.link/20250307132649.4056210-1-lukasz.luba@arm.com [ rjw: Subject edits ] Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig index 69ef8d081c98b..03c4c796d9931 100644 --- a/drivers/powercap/Kconfig +++ b/drivers/powercap/Kconfig @@ -82,7 +82,7 @@ config DTPM config DTPM_CPU bool "Add CPU power capping based on the energy model" - depends on DTPM && ENERGY_MODEL + depends on DTPM && ENERGY_MODEL && SMP help This enables support for CPU power limitation based on energy model. diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index ca947ed32e3dd..54a6236800194 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -380,8 +380,7 @@ config CPU_PM config ENERGY_MODEL bool "Energy Model for devices with DVFS (CPUs, GPUs, etc)" - depends on SMP - depends on CPU_FREQ + depends on CPU_FREQ || PM_DEVFREQ help Several subsystems (thermal and/or the task scheduler for example) can leverage information about the energy consumed by devices to