devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lukasz Majewski <l.majewski@samsung.com>
To: Eduardo Valentin <edubezval@gmail.com>,
	Kamil Debski <k.debski@samsung.com>,
	Jean Delvare <jdelvare@suse.de>,
	Guenter Roeck <linux@roeck-us.net>, Kukjin Kim <kgene@kernel.org>
Cc: lm-sensors@lm-sensors.org,
	Linux PM list <linux-pm@vger.kernel.org>,
	"linux-samsung-soc@vger.kernel.org"
	<linux-samsung-soc@vger.kernel.org>,
	devicetree@vger.kernel.org,
	Lukasz Majewski <l.majewski@majess.pl>,
	Kukjin Kim <kgene.kim@samsung.com>,
	linux-kernel@vger.kernel.org,
	Sjoerd Simons <sjoerd.simons@collabora.co.uk>,
	Abhilash Kesavan <kesavan.abhilash@gmail.com>,
	Abhilash Kesavan <a.kesavan@samsung.com>,
	Lukasz Majewski <l.majewski@samsung.com>
Subject: [PATCH v3 8/8] hwmon: pwm-fan: Code for using PWM FAN as a cooling device
Date: Fri, 06 Feb 2015 17:59:08 +0100	[thread overview]
Message-ID: <1423241948-31981-9-git-send-email-l.majewski@samsung.com> (raw)
In-Reply-To: <1423241948-31981-1-git-send-email-l.majewski@samsung.com>

The PWM FAN device can now be used as a thermal cooling device. Necessary
infrastructure has been added in this commit.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
---
Changes for v2:
- Replace pwm_fan_cooling_states with pwm_fan_cooling_levels
- Update ctx->pwm_fan_state when correct data from device tree is available
- Using therma_cdev_update() when thermal is ready for controlling the fan
Changes for v3:
- Rename patch heading
- pwm_fan_of_get_cooling_data() now returns -EINVAL when no "cooling-levels"
  property defined
- register of cooling device only when proper cooling data is present
---
 drivers/hwmon/pwm-fan.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 83 insertions(+), 3 deletions(-)

diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index f3f5843..79fe24e 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/sysfs.h>
+#include <linux/thermal.h>
 
 #define MAX_PWM 255
 
@@ -68,6 +69,17 @@ exit_set_pwm_err:
 	return ret;
 }
 
+static void pwm_fan_update_state(struct pwm_fan_ctx *ctx, unsigned long pwm)
+{
+	int i;
+
+	for (i = 0; i < ctx->pwm_fan_max_state; ++i)
+		if (pwm < ctx->pwm_fan_cooling_levels[i + 1])
+			break;
+
+	ctx->pwm_fan_state = i;
+}
+
 static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
 		       const char *buf, size_t count)
 {
@@ -82,6 +94,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr,
 	if (ret)
 		return ret;
 
+	pwm_fan_update_state(ctx, pwm);
 	return count;
 }
 
@@ -103,6 +116,59 @@ static struct attribute *pwm_fan_attrs[] = {
 
 ATTRIBUTE_GROUPS(pwm_fan);
 
+/* thermal cooling device callbacks */
+static int pwm_fan_get_max_state(struct thermal_cooling_device *cdev,
+				 unsigned long *state)
+{
+	struct pwm_fan_ctx *ctx = cdev->devdata;
+
+	*state = ctx->pwm_fan_max_state;
+
+	return 0;
+}
+
+static int pwm_fan_get_cur_state(struct thermal_cooling_device *cdev,
+				 unsigned long *state)
+{
+	struct pwm_fan_ctx *ctx = cdev->devdata;
+
+	if (!ctx)
+		return -EINVAL;
+
+	*state = ctx->pwm_fan_state;
+
+	return 0;
+}
+
+static int
+pwm_fan_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state)
+{
+	struct pwm_fan_ctx *ctx = cdev->devdata;
+	int ret;
+
+	if (!ctx || (state > ctx->pwm_fan_max_state))
+		return -EINVAL;
+
+	if (state == ctx->pwm_fan_state)
+		return 0;
+
+	ret = __set_pwm(ctx, ctx->pwm_fan_cooling_levels[state]);
+	if (ret) {
+		dev_err(&cdev->device, "Cannot set pwm!\n");
+		return ret;
+	}
+
+	ctx->pwm_fan_state = state;
+
+	return ret;
+}
+
+static const struct thermal_cooling_device_ops pwm_fan_cooling_ops = {
+	.get_max_state = pwm_fan_get_max_state,
+	.get_cur_state = pwm_fan_get_cur_state,
+	.set_cur_state = pwm_fan_set_cur_state,
+};
+
 int pwm_fan_of_get_cooling_data(struct device *dev, struct pwm_fan_ctx *ctx)
 {
 	struct device_node *np = dev->of_node;
@@ -113,7 +179,7 @@ int pwm_fan_of_get_cooling_data(struct device *dev, struct pwm_fan_ctx *ctx)
 
 	if (ret == -EINVAL) {
 		dev_err(dev, "Property 'cooling-levels' not found\n");
-		return 0;
+		return ret;
 	}
 
 	if (ret <= 0) {
@@ -149,8 +215,9 @@ int pwm_fan_of_get_cooling_data(struct device *dev, struct pwm_fan_ctx *ctx)
 
 static int pwm_fan_probe(struct platform_device *pdev)
 {
-	struct device *hwmon;
+	struct thermal_cooling_device *cdev;
 	struct pwm_fan_ctx *ctx;
+	struct device *hwmon;
 	int duty_cycle;
 	int ret;
 
@@ -194,8 +261,21 @@ static int pwm_fan_probe(struct platform_device *pdev)
 	}
 
 	ret = pwm_fan_of_get_cooling_data(&pdev->dev, ctx);
-	if (ret)
+	if (!ret) {
+		ctx->pwm_fan_state = ctx->pwm_fan_max_state;
+		cdev = thermal_of_cooling_device_register(pdev->dev.of_node,
+							  "pwm-fan", ctx,
+							  &pwm_fan_cooling_ops);
+		if (IS_ERR(cdev)) {
+			dev_err(&pdev->dev,
+				"Failed to register pwm-fan as cooling device");
+			pwm_disable(ctx->pwm);
+			return PTR_ERR(cdev);
+		}
+		thermal_cdev_update(cdev);
+	} else if (ret != -EINVAL) {
 		return ret;
+	}
 
 	return 0;
 }
-- 
2.0.0.rc2

  parent reply	other threads:[~2015-02-06 16:59 UTC|newest]

Thread overview: 117+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-18 10:13 [PATCH 0/9] hwmon: thermal: Odroid U3: Provide support for Odroid U3 fan Lukasz Majewski
2014-12-18 10:13 ` [PATCH 1/9] thermal: Provide stub for thermal_of_cooling_device_register() function Lukasz Majewski
2014-12-18 10:13 ` [PATCH 2/9] hwmon: dts: Doc: Add DTS doc to explain how to use PWM FAN as a cooling device Lukasz Majewski
2014-12-18 10:42   ` Sjoerd Simons
2014-12-19 15:32     ` Lukasz Majewski
2014-12-19 16:02       ` Guenter Roeck
2014-12-19 16:13         ` Lukasz Majewski
2015-01-05 10:50           ` Sjoerd Simons
     [not found]             ` <1420455034.15910.53.camel-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>
2015-01-14 13:56               ` Lukasz Majewski
2015-01-15  8:57                 ` Sjoerd Simons
2014-12-18 14:27   ` Guenter Roeck
     [not found]     ` <5492E46C.3080100-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2014-12-19 16:25       ` Lukasz Majewski
2014-12-18 10:13 ` [PATCH 3/9] ARM: dts: Add pwm-fan node to the Odroid-U3 board Lukasz Majewski
2014-12-18 10:13 ` [PATCH 4/9] hwmon: thermal: dts: Add properties to use pwm-fan device as a cooling device in Odroid U3 Lukasz Majewski
2014-12-18 10:13 ` [PATCH 5/9] hwmon: thermal: Extract __set_pwm() function to only modify PWM duty cycle Lukasz Majewski
2014-12-18 10:13 ` [PATCH 6/9] hwmon: thermal: Read PWM FAN configuration from device tree Lukasz Majewski
2014-12-18 10:13 ` [PATCH 7/9] hwmon: thermal: Code for using PWM FAN as a cooling device Lukasz Majewski
2014-12-18 10:13 ` [PATCH 8/9] hwmon: thermal: Provide 'default-pulse-width' property to setup FAN on boot Lukasz Majewski
2014-12-18 10:13 ` [PATCH 9/9] hwmon: thermal: dts: Disable FAN on boot on the Odroid U3 Lukasz Majewski
2014-12-22 16:27 ` [PATCH v2 0/8] hwmon: thermal: Odroid U3: Provide support for Odroid U3 fan Lukasz Majewski
2014-12-22 16:27   ` [PATCH v2 1/8] thermal: Provide stub for thermal_of_cooling_device_register() function Lukasz Majewski
2015-01-02 18:54     ` Eduardo Valentin
2015-01-02 19:03       ` Eduardo Valentin
2015-01-14 15:01         ` Lukasz Majewski
2015-01-14 18:32           ` Eduardo Valentin
2015-01-15  8:43             ` Lukasz Majewski
2014-12-22 16:27   ` [PATCH v2 2/8] thermal: Provide stub for thermal_cdev_update() function Lukasz Majewski
     [not found]     ` <1419265668-32283-3-git-send-email-l.majewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-01-02 18:40       ` Eduardo Valentin
2015-01-14 15:07         ` Lukasz Majewski
2015-01-14 18:28           ` Eduardo Valentin
2014-12-22 16:27   ` [PATCH v2 3/8] hwmon: dts: Doc: Add DTS doc to explain how to use PWM FAN as a cooling device Lukasz Majewski
2015-01-02 18:51     ` Eduardo Valentin
2014-12-22 16:27   ` [PATCH v2 4/8] ARM: dts: Add pwm-fan node to the Odroid-U3 board Lukasz Majewski
2014-12-22 16:27   ` [PATCH v2 5/8] hwmon: thermal: dts: Add properties to use pwm-fan device as a cooling device in Odroid U3 Lukasz Majewski
2015-01-02 18:52     ` Eduardo Valentin
2014-12-22 16:27   ` [PATCH v2 6/8] hwmon: thermal: Extract __set_pwm() function to only modify PWM duty cycle Lukasz Majewski
2014-12-29 12:52     ` Guenter Roeck
2014-12-22 16:27   ` [PATCH v2 7/8] hwmon: thermal: Read PWM FAN configuration from device tree Lukasz Majewski
2014-12-29 12:50     ` Guenter Roeck
2014-12-22 16:27   ` [PATCH v2 8/8] hwmon: thermal: Code for using PWM FAN as a cooling device Lukasz Majewski
     [not found] ` <1418897591-18332-1-git-send-email-l.majewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-02-06 16:59   ` [PATCH v3 0/8] hwmon: thermal: Odroid U3: Provide support for Odroid U3 fan Lukasz Majewski
2015-02-06 16:59     ` [PATCH v3 1/8] thermal: Provide stub for thermal_of_cooling_device_register() function Lukasz Majewski
2015-02-06 16:59     ` [PATCH v3 2/8] thermal: Provide stub for thermal_cdev_update() function Lukasz Majewski
2015-02-06 16:59     ` [PATCH v3 3/8] Documentation: dts: Documentation entry to explain how to use PWM FAN as a cooling device Lukasz Majewski
2015-02-06 16:59     ` [PATCH v3 4/8] ARM: dts: Add pwm-fan node to the Odroid-U3 board Lukasz Majewski
2015-02-06 16:59     ` [PATCH v3 5/8] ARM: dts: Add properties to use pwm-fan device as a cooling device in Odroid U3 Lukasz Majewski
2015-02-06 16:59     ` [PATCH v3 6/8] hwmon: pwm-fan: Extract __set_pwm() function to only modify PWM duty cycle Lukasz Majewski
2015-02-06 18:27       ` Guenter Roeck
2015-02-08 20:52         ` Lukasz Majewski
     [not found]     ` <1423241948-31981-1-git-send-email-l.majewski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>
2015-02-06 16:59       ` [PATCH v3 7/8] hwmon: pwm-fan: Read PWM FAN configuration from device tree Lukasz Majewski
2015-02-06 18:36         ` Guenter Roeck
2015-02-08 21:36           ` Lukasz Majewski
2015-02-09  4:40             ` Guenter Roeck
2015-02-06 16:59     ` Lukasz Majewski [this message]
2015-02-18 10:07 ` [PATCH v4 0/8] hwmon: thermal: Odroid U3: Provide support for Odroid U3 fan Lukasz Majewski
2015-02-18 10:07   ` [PATCH v4 1/8] thermal: Provide stub for thermal_of_cooling_device_register() function Lukasz Majewski
2015-02-24 19:21     ` Eduardo Valentin
2015-02-25 12:26       ` Lukasz Majewski
2015-02-18 10:07   ` [PATCH v4 2/8] thermal: Provide stub for thermal_cdev_update() function Lukasz Majewski
2015-02-24 19:21     ` Eduardo Valentin
2015-02-18 10:07   ` [PATCH v4 3/8] Documentation: dts: Documentation entry to explain how to use PWM FAN as a cooling device Lukasz Majewski
2015-02-24 19:25     ` Eduardo Valentin
2015-02-18 10:07   ` [PATCH v4 4/8] ARM: dts: Add pwm-fan node to the Odroid-U3 board Lukasz Majewski
2015-02-18 13:16     ` Andreas Färber
2015-02-18 10:07   ` [PATCH v4 5/8] ARM: dts: Add properties to use pwm-fan device as a cooling device in Odroid U3 Lukasz Majewski
2015-02-24 19:37     ` Eduardo Valentin
2015-02-25 13:28       ` Lukasz Majewski
2015-02-25 18:30         ` Eduardo Valentin
2015-02-18 10:07   ` [PATCH v4 6/8] hwmon: pwm-fan: Extract __set_pwm() function to only modify PWM duty cycle Lukasz Majewski
2015-02-18 10:07   ` [PATCH v4 7/8] hwmon: pwm-fan: Read PWM FAN configuration from device tree Lukasz Majewski
2015-02-21  0:26     ` Guenter Roeck
2015-02-23 16:13       ` Lukasz Majewski
2015-02-23 16:23         ` Guenter Roeck
2015-02-23 16:51           ` Lukasz Majewski
2015-02-23 16:59             ` Guenter Roeck
2015-02-18 10:07   ` [PATCH v4 8/8] hwmon: pwm-fan: Code for using PWM FAN as a cooling device Lukasz Majewski
2015-02-25 15:34 ` [PATCH v5 0/6] hwmon: thermal: Odroid U3: Provide support for Odroid U3 fan Lukasz Majewski
2015-02-25 15:34   ` [PATCH v5 1/6] Documentation: dts: Documentation entry to explain how to use PWM FAN as a cooling device Lukasz Majewski
2015-02-25 19:11     ` Eduardo Valentin
2015-02-25 19:13       ` Eduardo Valentin
2015-02-25 15:34   ` [PATCH v5 2/6] ARM: dts: Add pwm-fan node to the Odroid-U3 board Lukasz Majewski
2015-02-25 15:34   ` [PATCH v5 3/6] ARM: dts: Add properties to use pwm-fan device as a cooling device in Odroid U3 Lukasz Majewski
2015-02-25 18:49     ` Eduardo Valentin
2015-02-25 15:34   ` [PATCH v5 4/6] hwmon: pwm-fan: Extract __set_pwm() function to only modify PWM duty cycle Lukasz Majewski
2015-02-25 15:34   ` [PATCH v5 5/6] hwmon: pwm-fan: Read PWM FAN configuration from device tree Lukasz Majewski
2015-02-25 15:34   ` [PATCH v5 6/6] hwmon: pwm-fan: Code for using PWM FAN as a cooling device Lukasz Majewski
2015-02-25 18:24     ` Eduardo Valentin
2015-02-25 17:18   ` [PATCH v5 0/6] hwmon: thermal: Odroid U3: Provide support for Odroid U3 fan Guenter Roeck
2015-02-25 18:29     ` Eduardo Valentin
2015-02-25 18:42       ` Guenter Roeck
2015-02-26 13:59 ` [PATCH v6 " Lukasz Majewski
2015-02-26 13:59   ` [PATCH v6 1/6] Documentation: dts: Documentation entry to explain how to use PWM FAN as a cooling device Lukasz Majewski
2015-02-26 13:59   ` [PATCH v6 2/6] ARM: dts: Add pwm-fan node to the Odroid-U3 board Lukasz Majewski
2015-02-26 13:59   ` [PATCH v6 3/6] ARM: dts: Add properties to use pwm-fan device as a cooling device in Odroid U3 Lukasz Majewski
2015-02-26 13:59   ` [PATCH v6 4/6] hwmon: pwm-fan: Extract __set_pwm() function to only modify PWM duty cycle Lukasz Majewski
2015-02-26 13:59   ` [PATCH v6 5/6] hwmon: pwm-fan: Read PWM FAN configuration from device tree Lukasz Majewski
2015-02-26 13:59   ` [PATCH v6 6/6] hwmon: pwm-fan: Code for using PWM FAN as a cooling device Lukasz Majewski
2015-02-26 14:12     ` Guenter Roeck
2015-02-26 14:40       ` Lukasz Majewski
2015-03-04 12:03 ` [PATCH RESEND RESEND v6 0/6] hwmon: thermal: Odroid U3: Provide support for Odroid U3 fan Lukasz Majewski
2015-03-04 12:03   ` [PATCH RESEND v6 1/6] Documentation: dts: Documentation entry to explain how to use PWM FAN as a cooling device Lukasz Majewski
2015-03-04 12:03   ` [PATCH RESEND v6 2/6] ARM: dts: Add pwm-fan node to the Odroid-U3 board Lukasz Majewski
2015-03-04 12:03   ` [PATCH RESEND v6 3/6] ARM: dts: Add properties to use pwm-fan device as a cooling device in Odroid U3 Lukasz Majewski
2015-03-04 12:03   ` [PATCH RESEND v6 4/6] hwmon: pwm-fan: Extract __set_pwm() function to only modify PWM duty cycle Lukasz Majewski
2015-03-04 12:03   ` [PATCH RESEND v6 5/6] hwmon: pwm-fan: Read PWM FAN configuration from device tree Lukasz Majewski
2015-03-04 12:03   ` [PATCH RESEND v6 6/6] hwmon: pwm-fan: Code for using PWM FAN as a cooling device Lukasz Majewski
2015-08-11 13:07   ` [PATCH RESEND v6 0/3] dts: thermal: Odroid U3: Provide support for Odroid U3 fan Lukasz Majewski
2015-08-11 13:07     ` [PATCH RESEND v6 1/3] Documentation: dts: Documentation entry to explain how to use PWM FAN as a cooling device Lukasz Majewski
2015-08-13  0:17       ` Krzysztof Kozlowski
2015-08-14  9:36         ` Kukjin Kim
2015-08-16  9:35           ` Krzysztof Kozlowski
2015-09-16 11:00     ` [PATCH RESEND v6 0/3] dts: thermal: Odroid U3: Provide support for Odroid U3 fan Thomas Pietrowski
2015-09-16 11:57       ` Krzysztof Kozlowski
2015-08-11 13:14   ` [PATCH RESEND v6 2/3] ARM: dts: Add pwm-fan node to the Odroid-U3 board Lukasz Majewski
2015-08-13  0:35     ` Krzysztof Kozlowski
2015-08-11 13:15   ` [PATCH RESEND v6 3/3] ARM: dts: Add properties to use pwm-fan device as a cooling device in Odroid U3 Lukasz Majewski
2015-08-13  0:35     ` Krzysztof Kozlowski

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=1423241948-31981-9-git-send-email-l.majewski@samsung.com \
    --to=l.majewski@samsung.com \
    --cc=a.kesavan@samsung.com \
    --cc=devicetree@vger.kernel.org \
    --cc=edubezval@gmail.com \
    --cc=jdelvare@suse.de \
    --cc=k.debski@samsung.com \
    --cc=kesavan.abhilash@gmail.com \
    --cc=kgene.kim@samsung.com \
    --cc=kgene@kernel.org \
    --cc=l.majewski@majess.pl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=lm-sensors@lm-sensors.org \
    --cc=sjoerd.simons@collabora.co.uk \
    /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).