Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <6d43c93a748872293df489d397f894b77b221bc9.camel@intel.com>
Subject: Re: linux-next: Tree for Nov 15 (thermal:
 THERMAL_GOV_POWER_ALLOCATOR)
From:   Zhang Rui <rui.zhang@intel.com>
To:     Randy Dunlap <rdunlap@infradead.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux PM list <linux-pm@vger.kernel.org>,
        Eduardo Valentin <edubezval@gmail.com>,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Amit Kucheria <amit.kucheria@verdurent.com>, qperret@google.com
Date:   Thu, 05 Dec 2019 12:27:47 +0800
In-Reply-To: <9436e207-8a65-f01b-c348-32a8a00f03d4@infradead.org>
References: <20191115190525.77efdf6c@canb.auug.org.au>
         <247cd41e-a07b-adf0-4ec2-6467f0257837@infradead.org>
         <9436e207-8a65-f01b-c348-32a8a00f03d4@infradead.org>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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@intel.com>
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@intel.com>
---
 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