From c1cd894bcbb7c9f88555a888dba87300cc5fe041 Mon Sep 17 00:00:00 2001 From: Lukasz Luba Date: Mon, 16 Dec 2019 14:06:21 +0000 Subject: [PATCH] FROMLIST: thermal: Make cooling device trip point writable from sysfs Make it possible to change trip point for the cooling device instance in the thermal zone. It would be helpful in case when cooling devices can by bind to thermal zones using sysfs interface. A proper trip point can be chosen for a cooling device by: echo 2 > /sys/class/thermal/thermal_zoneX/cdev_Z_trip_point It is also possible to unpin cooling device from trip point: echo -1 > /sys/class/thermal/thermal_zoneX/cdev_Z_trip_point Change-Id: I69e7a592b7d76cabafb422311b6dea74c19924ea Signed-off-by: Lukasz Luba Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20191216140622.25467-3-lukasz.luba@arm.com Bug: 132152924 Signed-off-by: TeYuan Wang Bug: 155322354 (cherry picked from commit dba49f7921d207625ed979d9d0da3302195a0170) Signed-off-by: Saravana Kannan Signed-off-by: Will McVicker --- drivers/thermal/thermal_core.c | 3 ++- drivers/thermal/thermal_core.h | 2 ++ drivers/thermal/thermal_sysfs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 80416df5fcd4..8123f68b4224 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -769,8 +769,9 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, sprintf(dev->attr_name, "cdev%d_trip_point", dev->id); sysfs_attr_init(&dev->attr.attr); dev->attr.attr.name = dev->attr_name; - dev->attr.attr.mode = 0444; + dev->attr.attr.mode = 0644; dev->attr.show = trip_point_show; + dev->attr.store = trip_point_store; result = device_create_file(&tz->device, &dev->attr); if (result) goto remove_symbol_link; diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h index d1183139e433..ee35e08be465 100644 --- a/drivers/thermal/thermal_core.h +++ b/drivers/thermal/thermal_core.h @@ -61,6 +61,8 @@ void thermal_cooling_device_setup_sysfs(struct thermal_cooling_device *); void thermal_cooling_device_destroy_sysfs(struct thermal_cooling_device *cdev); /* used only at binding time */ ssize_t trip_point_show(struct device *, struct device_attribute *, char *); +ssize_t trip_point_store(struct device *, struct device_attribute *, + const char *, size_t); ssize_t weight_show(struct device *, struct device_attribute *, char *); ssize_t weight_store(struct device *, struct device_attribute *, const char *, size_t); diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c index aa99edb4dff7..80c8bae6dd1c 100644 --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c @@ -977,6 +977,26 @@ trip_point_show(struct device *dev, struct device_attribute *attr, char *buf) return sprintf(buf, "%d\n", instance->trip); } +ssize_t trip_point_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct thermal_instance *instance; + int ret, trip; + + ret = kstrtoint(buf, 0, &trip); + if (ret) + return ret; + + instance = container_of(attr, struct thermal_instance, attr); + + if (trip >= instance->tz->trips || trip < THERMAL_TRIPS_NONE) + return -EINVAL; + + instance->trip = trip; + + return count; +} + ssize_t weight_show(struct device *dev, struct device_attribute *attr, char *buf) {