From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BE7AC43603 for ; Thu, 5 Dec 2019 04:27:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4BB89206DB for ; Thu, 5 Dec 2019 04:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728522AbfLEE1v (ORCPT ); Wed, 4 Dec 2019 23:27:51 -0500 Received: from mga18.intel.com ([134.134.136.126]:40139 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728374AbfLEE1v (ORCPT ); Wed, 4 Dec 2019 23:27:51 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Dec 2019 20:27:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,279,1571727600"; d="scan'208";a="243106642" Received: from yuanwan1-mobl.ccr.corp.intel.com ([10.249.174.225]) by fmsmga002.fm.intel.com with ESMTP; 04 Dec 2019 20:27:48 -0800 Message-ID: <6d43c93a748872293df489d397f894b77b221bc9.camel@intel.com> Subject: Re: linux-next: Tree for Nov 15 (thermal: THERMAL_GOV_POWER_ALLOCATOR) From: Zhang Rui To: Randy Dunlap , Stephen Rothwell , Linux Next Mailing List Cc: Linux Kernel Mailing List , Linux PM list , Eduardo Valentin , Daniel Lezcano , Amit Kucheria , 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" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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] && > > > > > > 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 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] && 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 --- 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