From: Jeson Gao <jeson.gao@unisoc.com>

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 <jeson.gao@unisoc.com>
[Added missing SMP config option in DTPM_CPU dependency]
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
---

Hi Rafael,

This fixes the issue in the former patch with the DTMP_CPU
implicit build dependencies on SMP.
The original patch can be found here [1] (the one that you had to revert).

Regards,
Lukasz Luba

[1] https://lore.kernel.org/lkml/20241219091109.10050-1-xuewen.yan@unisoc.com/


 drivers/powercap/Kconfig | 2 +-
 kernel/power/Kconfig     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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
-- 
2.48.1

On Fri, Mar 7, 2025 at 2:27 PM Lukasz Luba <lukasz.luba@arm.com> wrote:
>
> From: Jeson Gao <jeson.gao@unisoc.com>
>
> 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 <jeson.gao@unisoc.com>
> [Added missing SMP config option in DTPM_CPU dependency]
> Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
> ---
>
> Hi Rafael,
>
> This fixes the issue in the former patch with the DTMP_CPU
> implicit build dependencies on SMP.
> The original patch can be found here [1] (the one that you had to revert).
>
> Regards,
> Lukasz Luba
>
> [1] https://lore.kernel.org/lkml/20241219091109.10050-1-xuewen.yan@unisoc.com/
>
>
>  drivers/powercap/Kconfig | 2 +-
>  kernel/power/Kconfig     | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> 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
> --

Applied as 6.15 material, thanks!