Skip to contentSkip to conversation

cpufreq: cpu0: make THERMAL_CPU support optional

PATCH In review Rob Herring 2 participants 4 messages Feb 1, 2014 – Feb 4, 2014 CPU frequency scaling framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpufreq: cpu0: make THERMAL_CPU support optional

From: Rob Herring <[email protected]>

The addition of THERMAL and THERMAL_CPU selections causes a kconfig warning on highbank platforms:

warning: (ARM_HIGHBANK_CPUFREQ) selects GENERIC_CPUFREQ_CPU0 which has unmet direct dependencies (ARCH_HAS_CPUFREQ && CPU_FREQ && HAVE_CLK &&
REGULATOR && OF && THERMAL && CPU_THERMAL)

The cpufreq-cpu0 driver does not require thermal zone support, and it should be selectable independently. Add a new kconfig option to enable this feature.

---
 drivers/cpufreq/Kconfig | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/cpufreq/Kconfig +9 -1
index 4b029c0..a197a04a 100644
@@ -185,7 +185,7 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
 config GENERIC_CPUFREQ_CPU0
 	tristate "Generic CPU0 cpufreq driver"
-	depends on HAVE_CLK && REGULATOR && OF && THERMAL && CPU_THERMAL
+	depends on HAVE_CLK && REGULATOR && OF
 	select PM_OPP
 	help
 	  This adds a generic cpufreq driver for CPU0 frequency management.
@@ -194,6 +194,14 @@ config GENERIC_CPUFREQ_CPU0
 
 	  If in doubt, say N.
 
+config GENERIC_CPUFREQ_CPU0_THERMAL
+	bool "Thermal zone support for Generic CPU0 cpufreq"
+	depends on GENERIC_CPUFREQ_CPU0
+	select THERMAL
+	select THERMAL_CPU
+	help
+	  This adds thermal support to the generic cpufreq driver for CPU0.
+
 menu "x86 CPU frequency scaling drivers"
 depends on X86
 source "drivers/cpufreq/Kconfig.x86"
Signature · 1 line
1.8.3.2
maintainer
#1 lore raw

Cc'ing the guy who introduced this bug..

Quoted 27 lines · Rob Herring

From: Rob Herring <[email protected]>

The addition of THERMAL and THERMAL_CPU selections causes a kconfig warning on highbank platforms:

warning: (ARM_HIGHBANK_CPUFREQ) selects GENERIC_CPUFREQ_CPU0 which has unmet direct dependencies (ARCH_HAS_CPUFREQ && CPU_FREQ && HAVE_CLK &&
REGULATOR && OF && THERMAL && CPU_THERMAL)

The cpufreq-cpu0 driver does not require thermal zone support, and it should be selectable independently. Add a new kconfig option to enable this feature.

---
 drivers/cpufreq/Kconfig | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/cpufreq/Kconfig +0 -0
index 4b029c0..a197a04a 100644

drivers/cpufreq/Kconfig config CPU_FREQ_GOV_CONSERVATIVE · line 188

Quoted 5 lines
drivers/cpufreq/Kconfig +1 -1
@@ -185,7 +185,7 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
 config GENERIC_CPUFREQ_CPU0
        tristate "Generic CPU0 cpufreq driver"
-       depends on HAVE_CLK && REGULATOR && OF && THERMAL && CPU_THERMAL
+       depends on HAVE_CLK && REGULATOR && OF

That's fine as code would still compile due to dummy routines..

Quoted 4 lines
drivers/cpufreq/Kconfig +0 -0
        select PM_OPP
        help
          This adds a generic cpufreq driver for CPU0 frequency management.

drivers/cpufreq/Kconfig config GENERIC_CPUFREQ_CPU0 · line 203

Quoted 10 lines
drivers/cpufreq/Kconfig +7 -0
@@ -194,6 +194,14 @@ config GENERIC_CPUFREQ_CPU0
 
          If in doubt, say N.
 
+config GENERIC_CPUFREQ_CPU0_THERMAL
+       bool "Thermal zone support for Generic CPU0 cpufreq"
+       depends on GENERIC_CPUFREQ_CPU0
+       select THERMAL
+       select THERMAL_CPU
+       help
+         This adds thermal support to the generic cpufreq driver for CPU0.

But do we really need this? Let the platform enable THERMAL and THERMAL_CPU themselves, as this was the case currently.

#2 lore raw
Quoted 45 lines · Viresh Kumar

Cc'ing the guy who introduced this bug..

Quoted 27 lines · Rob Herring

From: Rob Herring <[email protected]>

The addition of THERMAL and THERMAL_CPU selections causes a kconfig warning on highbank platforms:

warning: (ARM_HIGHBANK_CPUFREQ) selects GENERIC_CPUFREQ_CPU0 which has unmet direct dependencies (ARCH_HAS_CPUFREQ && CPU_FREQ && HAVE_CLK &&
REGULATOR && OF && THERMAL && CPU_THERMAL)

The cpufreq-cpu0 driver does not require thermal zone support, and it should be selectable independently. Add a new kconfig option to enable this feature.

---
 drivers/cpufreq/Kconfig | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/cpufreq/Kconfig +0 -0
index 4b029c0..a197a04a 100644

drivers/cpufreq/Kconfig config CPU_FREQ_GOV_CONSERVATIVE · line 188

Quoted 5 lines
drivers/cpufreq/Kconfig +1 -1
@@ -185,7 +185,7 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
 config GENERIC_CPUFREQ_CPU0
        tristate "Generic CPU0 cpufreq driver"
-       depends on HAVE_CLK && REGULATOR && OF && THERMAL && CPU_THERMAL
+       depends on HAVE_CLK && REGULATOR && OF

That's fine as code would still compile due to dummy routines..

Quoted 7 lines
drivers/cpufreq/Kconfig +0 -0
        select PM_OPP
        help
          This adds a generic cpufreq driver for CPU0 frequency management.
@@ -194,6 +194,14 @@ config GENERIC_CPUFREQ_CPU0
 
          If in doubt, say N.
 
Quoted 10 lines

drivers/cpufreq/Kconfig config GENERIC_CPUFREQ_CPU0 · line 203

Quoted 7 lines
drivers/cpufreq/Kconfig +7 -0
+config GENERIC_CPUFREQ_CPU0_THERMAL
+       bool "Thermal zone support for Generic CPU0 cpufreq"
+       depends on GENERIC_CPUFREQ_CPU0
+       select THERMAL
+       select THERMAL_CPU
+       help
+         This adds thermal support to the generic cpufreq driver for CPU0.

But do we really need this? Let the platform enable THERMAL and THERMAL_CPU themselves, as this was the case currently.

That's certainly fine by me, but I don't know which platforms those are.

BTW, REGULATOR could probably be dropped as well. It certainly works w/o a regulator as highbank does not define one.

Rob

maintainer
#3 lore raw
Quoted 1 line · Rob Herring

That's certainly fine by me, but I don't know which platforms those are.

Probably OMAP as the author came from TI and has tested it on OMAPs

https://lkml.org/lkml/2013/9/26/787

Quoted 2 lines

BTW, REGULATOR could probably be dropped as well. It certainly works w/o a regulator as highbank does not define one.

Sure. Get that out as well in the same patch.