On Wed, 2019-12-04 at 08:25 -0800, Randy Dunlap wrote:
> On 11/15/19 3:44 PM, Randy Dunlap wrote:
> > On 11/15/19 12:05 AM, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > Changes since 20191114:
> > >
> >
> > on i386:
> >
> > WARNING: unmet direct dependencies detected for
> > THERMAL_GOV_POWER_ALLOCATOR
> > Depends on [n]: THERMAL [=y] && ENERGY_MODEL [=n]
> > Selected by [y]:
> > - THERMAL_DEFAULT_GOV_POWER_ALLOCATOR [=y] && <choice>
> >
> >
> > THERMAL_GOV_POWER_ALLOCATOR is selected by
> > THERMAL_DEFAULT_GOV_POWER_ALLOCATOR
> > even though ENERGY_MODEL is not set/enabled.
> >
> >
>
> This Kconfig warning is still happening in linux-next of 20191204.
>
I overlooked the original report probably because I was not CCed.
This is introduced by commit a4e893e802e6("thermal: cpu_cooling:
Migrate to using the EM framework") which adds the dependency of
ENERGY_MODEL for THERMAL_GOV_POWER_ALLOCATOR.
To fix this, it's better to make THERMAL_DEFAULT_GOV_POWER_ALLOCATOR
depends on THERMAL_GOV_POWER_ALLOCATOR instead.
Please confirm the problem is fixed by below patch.
thanks,
rui
>From c9429f6e28ea2219686a4294d39f015ba373774b Mon Sep 17 00:00:00 2001
From: Zhang Rui <rui.zhang@xxxxxxxxx>
Date: Thu, 5 Dec 2019 12:17:07 +0800
Subject: [PATCH] thermal: fix a Kconfig warning
Currently, THERMAL_GOV_POWER_ALLOCATOR is selected by
THERMAL_DEFAULT_GOV_POWER_ALLOCATOR even if it has some unmet
dependencies.
This causes the Kconfig warning
WARNING: unmet direct dependencies detected for
THERMAL_GOV_POWER_ALLOCATOR
Depends on [n]: THERMAL [=y] && ENERGY_MODEL [=n]
Selected by [y]:
- THERMAL_DEFAULT_GOV_POWER_ALLOCATOR [=y] && <choice>
Fix the problem by making THERMAL_DEFAULT_GOV_POWER_ALLOCATOR depends on
THERMAL_GOV_POWER_ALLOCATOR instead.
Fixes: a4e893e802e6("thermal: cpu_cooling: Migrate to using the EM framework")
Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
---
drivers/thermal/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 59b79fc48266..79b27865c6f4 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -108,7 +108,7 @@ config THERMAL_DEFAULT_GOV_USER_SPACE
config THERMAL_DEFAULT_GOV_POWER_ALLOCATOR
bool "power_allocator"
- select THERMAL_GOV_POWER_ALLOCATOR
+ depends on THERMAL_GOV_POWER_ALLOCATOR
help
Select this if you want to control temperature based on
system and device power allocation. This governor can only
--
2.17.1
