diff mbox series

power: energy_model: Rework the depends on for CONFIG_ENERGY_MODEL

Message ID 20241219091109.10050-1-xuewen.yan@unisoc.com
State New
Headers show
Series power: energy_model: Rework the depends on for CONFIG_ENERGY_MODEL | expand

Commit Message

Xuewen Yan Dec. 19, 2024, 9:11 a.m. UTC 
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>
---
 kernel/power/Kconfig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Lukasz Luba Dec. 19, 2024, 9:18 a.m. UTC | #1 
On 12/19/24 09:11, Xuewen Yan 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.

That's true, there are 1-CPU platforms supported. Also, GPU can have
the EM alone.

> 
> Signed-off-by: Jeson Gao <jeson.gao@unisoc.com>
> ---
>   kernel/power/Kconfig | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
> index afce8130d8b9..c532aee09e12 100644
> --- a/kernel/power/Kconfig
> +++ b/kernel/power/Kconfig
> @@ -361,8 +361,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

Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Xuewen Yan Feb. 13, 2025, 2:18 a.m. UTC | #2 
Hi Rafael,

I noticed that this patch has not been merged yet. Do you have any comments?

BR

On Thu, Dec 19, 2024 at 5:17 PM Lukasz Luba <lukasz.luba@arm.com> wrote:
>
>
>
> On 12/19/24 09:11, Xuewen Yan 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.
>
> That's true, there are 1-CPU platforms supported. Also, GPU can have
> the EM alone.
>
> >
> > Signed-off-by: Jeson Gao <jeson.gao@unisoc.com>
> > ---
> >   kernel/power/Kconfig | 3 +--
> >   1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
> > index afce8130d8b9..c532aee09e12 100644
> > --- a/kernel/power/Kconfig
> > +++ b/kernel/power/Kconfig
> > @@ -361,8 +361,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
>
> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Lukasz Luba March 5, 2025, 9:50 a.m. UTC | #3 
Hi Rafael,

On 2/13/25 02:18, Xuewen Yan wrote:
> Hi Rafael,
> 
> I noticed that this patch has not been merged yet. Do you have any comments?
> 
> BR
> 
> On Thu, Dec 19, 2024 at 5:17 PM Lukasz Luba <lukasz.luba@arm.com> wrote:
>>
>>
>>
>> On 12/19/24 09:11, Xuewen Yan 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.
>>
>> That's true, there are 1-CPU platforms supported. Also, GPU can have
>> the EM alone.
>>
>>>
>>> Signed-off-by: Jeson Gao <jeson.gao@unisoc.com>
>>> ---
>>>    kernel/power/Kconfig | 3 +--
>>>    1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
>>> index afce8130d8b9..c532aee09e12 100644
>>> --- a/kernel/power/Kconfig
>>> +++ b/kernel/power/Kconfig
>>> @@ -361,8 +361,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
>>
>> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>

Gentle ping. You probably have missed that change for the v6.15 queue

Regards,
Lukasz
Rafael J. Wysocki March 5, 2025, 2:57 p.m. UTC | #4 
Hi,

On Wed, Mar 5, 2025 at 10:51 AM Lukasz Luba <lukasz.luba@arm.com> wrote:
>
> Hi Rafael,
>
> On 2/13/25 02:18, Xuewen Yan wrote:
> > Hi Rafael,
> >
> > I noticed that this patch has not been merged yet. Do you have any comments?
> >
> > BR
> >
> > On Thu, Dec 19, 2024 at 5:17 PM Lukasz Luba <lukasz.luba@arm.com> wrote:
> >>
> >>
> >>
> >> On 12/19/24 09:11, Xuewen Yan 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.
> >>
> >> That's true, there are 1-CPU platforms supported. Also, GPU can have
> >> the EM alone.
> >>
> >>>
> >>> Signed-off-by: Jeson Gao <jeson.gao@unisoc.com>
> >>> ---
> >>>    kernel/power/Kconfig | 3 +--
> >>>    1 file changed, 1 insertion(+), 2 deletions(-)
> >>>
> >>> diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
> >>> index afce8130d8b9..c532aee09e12 100644
> >>> --- a/kernel/power/Kconfig
> >>> +++ b/kernel/power/Kconfig
> >>> @@ -361,8 +361,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
> >>
> >> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
>
> Gentle ping. You probably have missed that change for the v6.15 queue

Indeed, I have missed this one.

Now applied as 6.15 material, thanks!
Rafael J. Wysocki March 6, 2025, 7:38 p.m. UTC | #5 
On Wed, Mar 5, 2025 at 3:57 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> Hi,
>
> On Wed, Mar 5, 2025 at 10:51 AM Lukasz Luba <lukasz.luba@arm.com> wrote:
> >
> > Hi Rafael,
> >
> > On 2/13/25 02:18, Xuewen Yan wrote:
> > > Hi Rafael,
> > >
> > > I noticed that this patch has not been merged yet. Do you have any comments?
> > >
> > > BR
> > >
> > > On Thu, Dec 19, 2024 at 5:17 PM Lukasz Luba <lukasz.luba@arm.com> wrote:
> > >>
> > >>
> > >>
> > >> On 12/19/24 09:11, Xuewen Yan 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.
> > >>
> > >> That's true, there are 1-CPU platforms supported. Also, GPU can have
> > >> the EM alone.
> > >>
> > >>>
> > >>> Signed-off-by: Jeson Gao <jeson.gao@unisoc.com>
> > >>> ---
> > >>>    kernel/power/Kconfig | 3 +--
> > >>>    1 file changed, 1 insertion(+), 2 deletions(-)
> > >>>
> > >>> diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
> > >>> index afce8130d8b9..c532aee09e12 100644
> > >>> --- a/kernel/power/Kconfig
> > >>> +++ b/kernel/power/Kconfig
> > >>> @@ -361,8 +361,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
> > >>
> > >> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
> >
> > Gentle ping. You probably have missed that change for the v6.15 queue
>
> Indeed, I have missed this one.
>
> Now applied as 6.15 material, thanks!

And dropped because of

https://lore.kernel.org/linux-pm/202503070326.9hEUez42-lkp@intel.com/

Thanks!
diff mbox series

Patch

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index afce8130d8b9..c532aee09e12 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -361,8 +361,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