linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eduardo Valentin <eduardo.valentin@ti.com>
To: swarren@wwwdotorg.org, pawel.moll@arm.com, mark.rutland@arm.com,
	ian.campbell@citrix.com, rob.herring@calxeda.com,
	linux@roeck-us.net, rui.zhang@intel.com
Cc: wni@nvidia.com, grant.likely@linaro.org, durgadoss.r@intel.com,
	linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
	lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org,
	Eduardo Valentin <eduardo.valentin@ti.com>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	Viresh Kumar <viresh.kumar@linaro.org>,
	cpufreq@vger.kernel.org, devicetree-discuss@lists.ozlabs.org
Subject: [PATCHv5 05/20] cpufreq: cpufreq-cpu0: add dt node parsing for cooling device properties
Date: Tue, 12 Nov 2013 15:46:07 -0400	[thread overview]
Message-ID: <1384285582-16933-6-git-send-email-eduardo.valentin@ti.com> (raw)
In-Reply-To: <1384285582-16933-1-git-send-email-eduardo.valentin@ti.com>

This patch changes the cpufreq-cpu0 driver to consider if
a cpu needs cooling (with cpufreq). In case the cooling is needed,
the cpu0 device tree node needs to be properly configured
with cooling device properties.

In case these properties are present,, the driver will
load a cpufreq cooling device in the system. The cpufreq-cpu0
driver is not interested in determining how the system should
be using the cooling device. The driver is responsible
only of loading the cooling device.

Describing how the cooling device will be used can be
accomplished by setting up a thermal zone that references
and is composed by the cpufreq cooling device.

Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: cpufreq@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
---
 .../devicetree/bindings/cpufreq/cpufreq-cpu0.txt         |  7 +++++++
 drivers/cpufreq/Kconfig                                  |  2 +-
 drivers/cpufreq/cpufreq-cpu0.c                           | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
index 051f764..f055515 100644
--- a/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
+++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
@@ -15,6 +15,10 @@ Optional properties:
 - clock-latency: Specify the possible maximum transition latency for clock,
   in unit of nanoseconds.
 - voltage-tolerance: Specify the CPU voltage tolerance in percentage.
+- #cooling-cells:
+- cooling-min-level:
+- cooling-max-level:
+     Please refer to Documentation/devicetree/bindings/thermal/thermal.txt.
 
 Examples:
 
@@ -33,6 +37,9 @@ cpus {
 			198000  850000
 		>;
 		clock-latency = <61036>; /* two CLK32 periods */
+		#cooling-cells = <2>;
+		cooling-min-level = <0>;
+		cooling-max-level = <2>;
 	};
 
 	cpu@1 {
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 534fcb8..fc1e9a5 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -186,7 +186,7 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
 config GENERIC_CPUFREQ_CPU0
 	tristate "Generic CPU0 cpufreq driver"
-	depends on HAVE_CLK && REGULATOR && PM_OPP && OF
+	depends on HAVE_CLK && REGULATOR && PM_OPP && OF && THERMAL && CPU_THERMAL
 	select CPU_FREQ_TABLE
 	help
 	  This adds a generic cpufreq driver for CPU0 frequency management.
diff --git a/drivers/cpufreq/cpufreq-cpu0.c b/drivers/cpufreq/cpufreq-cpu0.c
index c522a95..568aaf3 100644
--- a/drivers/cpufreq/cpufreq-cpu0.c
+++ b/drivers/cpufreq/cpufreq-cpu0.c
@@ -13,7 +13,9 @@
 
 #include <linux/clk.h>
 #include <linux/cpu.h>
+#include <linux/cpu_cooling.h>
 #include <linux/cpufreq.h>
+#include <linux/cpumask.h>
 #include <linux/err.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -21,6 +23,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
+#include <linux/thermal.h>
 
 static unsigned int transition_latency;
 static unsigned int voltage_tolerance; /* in percentage */
@@ -29,6 +32,7 @@ static struct device *cpu_dev;
 static struct clk *cpu_clk;
 static struct regulator *cpu_reg;
 static struct cpufreq_frequency_table *freq_table;
+static struct thermal_cooling_device *cdev;
 
 static int cpu0_verify_speed(struct cpufreq_policy *policy)
 {
@@ -260,6 +264,17 @@ static int cpu0_cpufreq_probe(struct platform_device *pdev)
 		goto out_free_table;
 	}
 
+	/*
+	 * For now, just loading the cooling device;
+	 * thermal DT code takes care of matching them.
+	 */
+	if (of_find_property(np, "#cooling-cells", NULL)) {
+		cdev = of_cpufreq_cooling_register(np, cpu_present_mask);
+		if (IS_ERR(cdev))
+			pr_err("running cpufreq without cooling device: %ld\n",
+			       PTR_ERR(cdev));
+	}
+
 	of_node_put(np);
 	return 0;
 
@@ -272,6 +287,7 @@ out_put_node:
 
 static int cpu0_cpufreq_remove(struct platform_device *pdev)
 {
+	cpufreq_cooling_unregister(cdev);
 	cpufreq_unregister_driver(&cpu0_cpufreq_driver);
 	opp_free_cpufreq_table(cpu_dev, &freq_table);
 
-- 
1.8.2.1.342.gfa7285d


  parent reply	other threads:[~2013-11-12 19:48 UTC|newest]

Thread overview: 81+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-12 19:46 [PATCHv5 00/20] device thermal limits represented in device tree nodes (v5) Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 01/20] thermal: allow registering without .get_temp Eduardo Valentin
2013-11-12 19:46 ` [PATCHv9 02/20] thermal: introduce device tree parser Eduardo Valentin
     [not found]   ` <1384285582-16933-3-git-send-email-eduardo.valentin-l0cyMroinI0@public.gmane.org>
2013-11-13 16:57     ` Tomasz Figa
2013-11-14 11:31       ` Eduardo Valentin
2013-11-14 13:40         ` Tomasz Figa
2013-11-15 13:19           ` Eduardo Valentin
2013-11-21 14:57             ` Tomasz Figa
2013-11-21 15:48               ` Eduardo Valentin
2013-11-21 16:32                 ` Tomasz Figa
2013-11-22 12:33                   ` Eduardo Valentin
     [not found]                     ` <528F4F1E.60903-l0cyMroinI0@public.gmane.org>
2013-11-25 15:31                       ` Mark Rutland
     [not found]                         ` <20131125153118.GG32081-NuALmloUBlrZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2013-11-25 15:40                           ` Eduardo Valentin
2013-11-25 15:41                         ` Eduardo Valentin
2013-11-25 15:14               ` Mark Rutland
2013-11-25 15:34                 ` Eduardo Valentin
2013-11-15  8:07   ` [lm-sensors] " Jean Delvare
2013-11-18  6:04     ` Zhang Rui
2013-11-18 14:45       ` Eduardo Valentin
2013-11-19 14:43         ` Jean Delvare
2013-11-25 15:37   ` Mark Rutland
     [not found]     ` <20131125153721.GH32081-NuALmloUBlrZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org>
2013-11-25 15:47       ` Eduardo Valentin
2013-12-31 10:17   ` Wei Ni
     [not found]     ` <52C299A8.4010108-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2014-01-07  2:48       ` Wei Ni
     [not found]         ` <52CB6AE2.2090002-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2014-01-07 11:17           ` Eduardo Valentin
2014-01-08  3:19             ` Wei Ni
2014-01-08  3:24               ` Hu Yaohui
     [not found]                 ` <CAHqbYQvchi3QSgcitUtguFyOJtXhFt5OjcoiSDZnPg9ZyiN4cg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-01-08  4:16                   ` Wei Ni
2014-01-02  2:55   ` Wei Ni
2014-01-02  3:03     ` Wei Ni
2014-01-02  2:59   ` Wei Ni
2014-01-02 17:50     ` Matthew Longnecker
2014-01-06 13:51       ` Mark Rutland
2014-01-06 14:54         ` Eduardo Valentin
2014-01-07  2:44           ` Wei Ni
2014-01-07 12:02             ` Mark Rutland
2014-01-13 21:29             ` Eduardo Valentin
2014-01-14  2:54               ` Wei Ni
2014-01-14 18:48                 ` Eduardo Valentin
2014-01-13 15:37       ` Eduardo Valentin
2014-01-02 17:35   ` Matthew Longnecker
     [not found]     ` <52C5A344.2060908-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2014-01-06 18:52       ` Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 03/20] thermal: core: introduce thermal_of_cooling_device_register Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 04/20] thermal: cpu_cooling: introduce of_cpufreq_cooling_register Eduardo Valentin
2013-11-12 19:46 ` Eduardo Valentin [this message]
2013-11-14 13:17   ` [PATCHv5 05/20] cpufreq: cpufreq-cpu0: add dt node parsing for cooling device properties Eduardo Valentin
2013-11-14 22:04     ` Rafael J. Wysocki
2013-11-15  4:41   ` viresh kumar
2014-01-12 14:31   ` Zhang, Rui
2014-01-13 15:08     ` Eduardo Valentin
2014-01-14 19:07     ` Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 06/20] hwmon: lm75: expose to thermal fw via DT nodes Eduardo Valentin
2013-11-15  7:43   ` Jean Delvare
2013-11-18 14:27     ` Eduardo Valentin
2013-11-18 16:25       ` Guenter Roeck
2013-11-18 16:40         ` Eduardo Valentin
2013-11-19  9:39       ` Jean Delvare
2013-11-22 14:37         ` Eduardo Valentin
2013-11-23 18:38           ` Jean Delvare
2013-11-12 19:46 ` [PATCHv5 07/20] hwmon: tmp102: " Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 08/20] thermal: ti-soc-thermal: use thermal DT infrastructure Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 09/20] arm: dts: add omap4 CPU thermal data Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 10/20] arm: dts: add omap4430 " Eduardo Valentin
2013-11-20 12:32   ` Pavel Machek
2013-11-21 15:36     ` Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 11/20] arm: dts: add omap4460 " Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 12/20] arm: dts: add cooling properties on omap4430 cpu node Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 13/20] arm: dts: add cooling properties on omap4460 " Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 14/20] arm: dts: add omap5 GPU thermal data Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 15/20] arm: dts: add omap5 CORE " Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 16/20] arm: dts: add omap5 " Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 17/20] arm: dts: add cooling properties on omap5 cpu node Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 18/20] arm: dts: make OMAP443x bandgap node to belong to OCP Eduardo Valentin
2013-11-12 19:46 ` [PATCHv5 19/20] arm: dts: make OMAP4460 " Eduardo Valentin
     [not found] ` <1384285582-16933-1-git-send-email-eduardo.valentin-l0cyMroinI0@public.gmane.org>
2013-11-12 19:46   ` [PATCHv5 20/20] MAINTAINERS: add maintainer entry for thermal bindings Eduardo Valentin
2013-11-12 19:59     ` Olof Johansson
2013-11-12 20:14       ` Eduardo Valentin
2013-11-13  9:42         ` Mark Rutland
2013-11-13 12:17           ` Eduardo Valentin
2013-11-13 14:46           ` Eduardo Valentin
2013-11-14 13:30           ` [PATCHv6 20/20] MAINTAINERS: add thermal bindings entry in thermal domain Eduardo Valentin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1384285582-16933-6-git-send-email-eduardo.valentin@ti.com \
    --to=eduardo.valentin@ti.com \
    --cc=cpufreq@vger.kernel.org \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=devicetree@vger.kernel.org \
    --cc=durgadoss.r@intel.com \
    --cc=grant.likely@linaro.org \
    --cc=ian.campbell@citrix.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=lm-sensors@lm-sensors.org \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=rjw@sisk.pl \
    --cc=rob.herring@calxeda.com \
    --cc=rui.zhang@intel.com \
    --cc=swarren@wwwdotorg.org \
    --cc=viresh.kumar@linaro.org \
    --cc=wni@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).