| Message ID | 1431053231-3390-1-git-send-email-wni@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Zhang Rui |
| Headers | show |
On Fri, May 08, 2015 at 03:47:11AM +0100, Wei Ni wrote: > The Linux thermal framework support to change thermal governor > policy in userspace, but it can't show what available policies > supported. > > This patch adds available_policies attribute to the thermal > framework, it can list the thermal governors which can be > used for a particular zone. This attribute is read only. > > Signed-off-by: Wei Ni <wni@nvidia.com> It's an old thread, but I see myself coming back to this patch from time to time. It would be good to have this merged and be part of the thermal framework. Other subsystems with governors (like devfreq) have a similar entry and it's useful. One minor comment below. > --- > v2: This change had been submitted and discussed in > http://marc.info/?l=linux-tegra&m=138961183931457&w=2 > https://www.marc.info/?l=linux-pm&m=138986468007449&w=1 > cherry-picked it,and updated to this v2 version. > > Documentation/thermal/sysfs-api.txt | 6 ++++++ > drivers/thermal/thermal_core.c | 28 ++++++++++++++++++++++++++++ > 2 files changed, 34 insertions(+) > > diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt > index 7d44d7f1a71b..e7d03cfafc63 100644 > --- a/Documentation/thermal/sysfs-api.txt > +++ b/Documentation/thermal/sysfs-api.txt > @@ -180,6 +180,7 @@ Thermal zone device sys I/F, created once it's registered: > |---temp: Current temperature > |---mode: Working mode of the thermal zone > |---policy: Thermal governor used for this zone > + |---available_policies: Available thermal governors for this zone > |---trip_point_[0-*]_temp: Trip point temperature > |---trip_point_[0-*]_type: Trip point type > |---trip_point_[0-*]_hyst: Hysteresis value for this trip point > @@ -254,6 +255,10 @@ policy > One of the various thermal governors used for a particular zone. > RW, Required > > +available_policies > + Available thermal governors which can be used for a particular zone. > + RO, Required > + > trip_point_[0-*]_temp > The temperature above which trip point will be fired. > Unit: millidegree Celsius > @@ -401,6 +406,7 @@ method, the sys I/F structure will be built like this: > |---temp: 37000 > |---mode: enabled > |---policy: step_wise > + |---available_policies: step_wise fair_share > |---trip_point_0_temp: 100000 > |---trip_point_0_type: critical > |---trip_point_1_temp: 80000 > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 962de1847cc0..68a603a3d4ed 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -847,6 +847,27 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf) > return sprintf(buf, "%s\n", tz->governor->name); > } > > +static ssize_t > +available_policies_show(struct device *dev, struct device_attribute *devattr, > + char *buf) > +{ > + struct thermal_governor *pos; > + ssize_t count = 0; > + ssize_t size; Initialize size to avoid this compiler warning: drivers/thermal/thermal_core.c: In function ‘available_policies_show’: drivers/thermal/thermal_core.c:864:11: warning: ‘size’ may be used uninitialized in this function [-Wmaybe-uninitialized] count += scnprintf(buf + count, size, "\n"); If I understand it correctly, it should be initialized to PAGE_SIZE. Other than this, you can add my Reviewed-by: Javi Merino <javi.merino@arm.com> > + > + mutex_lock(&thermal_governor_lock); > + > + list_for_each_entry(pos, &thermal_governor_list, governor_list) { > + size = PAGE_SIZE - count; > + count += scnprintf(buf + count, size, "%s ", pos->name); > + } > + count += scnprintf(buf + count, size, "\n"); > + > + mutex_unlock(&thermal_governor_lock); > + > + return count; > +} > + > #ifdef CONFIG_THERMAL_EMULATION > static ssize_t > emul_temp_store(struct device *dev, struct device_attribute *attr, > @@ -1028,6 +1049,7 @@ static DEVICE_ATTR(temp, 0444, temp_show, NULL); > static DEVICE_ATTR(mode, 0644, mode_show, mode_store); > static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, passive_store); > static DEVICE_ATTR(policy, S_IRUGO | S_IWUSR, policy_show, policy_store); > +static DEVICE_ATTR(available_policies, S_IRUGO, available_policies_show, NULL); > > /* sys I/F for cooling device */ > #define to_cooling_device(_dev) \ > @@ -1813,6 +1835,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, > if (result) > goto unregister; > > + /* Create available_policies attribute */ > + result = device_create_file(&tz->device, &dev_attr_available_policies); > + if (result) > + goto unregister; > + > /* Update 'this' zone's governor information */ > mutex_lock(&thermal_governor_lock); > > @@ -1913,6 +1940,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) > if (tz->ops->get_mode) > device_remove_file(&tz->device, &dev_attr_mode); > device_remove_file(&tz->device, &dev_attr_policy); > + device_remove_file(&tz->device, &dev_attr_available_policies); > remove_trip_attrs(tz); > thermal_set_governor(tz, NULL); > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
? 2015?07?13? 20:11, Javi Merino ??: > On Fri, May 08, 2015 at 03:47:11AM +0100, Wei Ni wrote: >> The Linux thermal framework support to change thermal governor >> policy in userspace, but it can't show what available policies >> supported. >> >> This patch adds available_policies attribute to the thermal >> framework, it can list the thermal governors which can be >> used for a particular zone. This attribute is read only. >> >> Signed-off-by: Wei Ni <wni@nvidia.com> > > It's an old thread, but I see myself coming back to this patch from > time to time. It would be good to have this merged and be part of the > thermal framework. Other subsystems with governors (like devfreq) have > a similar entry and it's useful. > > One minor comment below. > >> --- >> v2: This change had been submitted and discussed in >> http://marc.info/?l=linux-tegra&m=138961183931457&w=2 >> https://www.marc.info/?l=linux-pm&m=138986468007449&w=1 >> cherry-picked it,and updated to this v2 version. >> >> Documentation/thermal/sysfs-api.txt | 6 ++++++ >> drivers/thermal/thermal_core.c | 28 ++++++++++++++++++++++++++++ >> 2 files changed, 34 insertions(+) >> >> diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt >> index 7d44d7f1a71b..e7d03cfafc63 100644 >> --- a/Documentation/thermal/sysfs-api.txt >> +++ b/Documentation/thermal/sysfs-api.txt >> @@ -180,6 +180,7 @@ Thermal zone device sys I/F, created once it's registered: >> |---temp: Current temperature >> |---mode: Working mode of the thermal zone >> |---policy: Thermal governor used for this zone >> + |---available_policies: Available thermal governors for this zone >> |---trip_point_[0-*]_temp: Trip point temperature >> |---trip_point_[0-*]_type: Trip point type >> |---trip_point_[0-*]_hyst: Hysteresis value for this trip point >> @@ -254,6 +255,10 @@ policy >> One of the various thermal governors used for a particular zone. >> RW, Required >> >> +available_policies >> + Available thermal governors which can be used for a particular zone. >> + RO, Required >> + >> trip_point_[0-*]_temp >> The temperature above which trip point will be fired. >> Unit: millidegree Celsius >> @@ -401,6 +406,7 @@ method, the sys I/F structure will be built like this: >> |---temp: 37000 >> |---mode: enabled >> |---policy: step_wise >> + |---available_policies: step_wise fair_share >> |---trip_point_0_temp: 100000 >> |---trip_point_0_type: critical >> |---trip_point_1_temp: 80000 >> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c >> index 962de1847cc0..68a603a3d4ed 100644 >> --- a/drivers/thermal/thermal_core.c >> +++ b/drivers/thermal/thermal_core.c >> @@ -847,6 +847,27 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf) >> return sprintf(buf, "%s\n", tz->governor->name); >> } >> >> +static ssize_t >> +available_policies_show(struct device *dev, struct device_attribute *devattr, >> + char *buf) >> +{ >> + struct thermal_governor *pos; >> + ssize_t count = 0; >> + ssize_t size; > > Initialize size to avoid this compiler warning: > > drivers/thermal/thermal_core.c: In function ‘available_policies_show’: > drivers/thermal/thermal_core.c:864:11: warning: ‘size’ may be used > uninitialized in this function [-Wmaybe-uninitialized] > count += scnprintf(buf + count, size, "\n"); > > If I understand it correctly, it should be initialized to PAGE_SIZE. Will initialize it in next patch. > > Other than this, you can add my > > Reviewed-by: Javi Merino <javi.merino@arm.com> Thanks for your review, will add it :) > >> + >> + mutex_lock(&thermal_governor_lock); >> + >> + list_for_each_entry(pos, &thermal_governor_list, governor_list) { >> + size = PAGE_SIZE - count; >> + count += scnprintf(buf + count, size, "%s ", pos->name); >> + } >> + count += scnprintf(buf + count, size, "\n"); >> + >> + mutex_unlock(&thermal_governor_lock); >> + >> + return count; >> +} >> + >> #ifdef CONFIG_THERMAL_EMULATION >> static ssize_t >> emul_temp_store(struct device *dev, struct device_attribute *attr, >> @@ -1028,6 +1049,7 @@ static DEVICE_ATTR(temp, 0444, temp_show, NULL); >> static DEVICE_ATTR(mode, 0644, mode_show, mode_store); >> static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, passive_store); >> static DEVICE_ATTR(policy, S_IRUGO | S_IWUSR, policy_show, policy_store); >> +static DEVICE_ATTR(available_policies, S_IRUGO, available_policies_show, NULL); >> >> /* sys I/F for cooling device */ >> #define to_cooling_device(_dev) \ >> @@ -1813,6 +1835,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, >> if (result) >> goto unregister; >> >> + /* Create available_policies attribute */ >> + result = device_create_file(&tz->device, &dev_attr_available_policies); >> + if (result) >> + goto unregister; >> + >> /* Update 'this' zone's governor information */ >> mutex_lock(&thermal_governor_lock); >> >> @@ -1913,6 +1940,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) >> if (tz->ops->get_mode) >> device_remove_file(&tz->device, &dev_attr_mode); >> device_remove_file(&tz->device, &dev_attr_policy); >> + device_remove_file(&tz->device, &dev_attr_available_policies); >> remove_trip_attrs(tz); >> thermal_set_governor(tz, NULL); >> ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. ----------------------------------------------------------------------------------- -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt index 7d44d7f1a71b..e7d03cfafc63 100644 --- a/Documentation/thermal/sysfs-api.txt +++ b/Documentation/thermal/sysfs-api.txt @@ -180,6 +180,7 @@ Thermal zone device sys I/F, created once it's registered: |---temp: Current temperature |---mode: Working mode of the thermal zone |---policy: Thermal governor used for this zone + |---available_policies: Available thermal governors for this zone |---trip_point_[0-*]_temp: Trip point temperature |---trip_point_[0-*]_type: Trip point type |---trip_point_[0-*]_hyst: Hysteresis value for this trip point @@ -254,6 +255,10 @@ policy One of the various thermal governors used for a particular zone. RW, Required +available_policies + Available thermal governors which can be used for a particular zone. + RO, Required + trip_point_[0-*]_temp The temperature above which trip point will be fired. Unit: millidegree Celsius @@ -401,6 +406,7 @@ method, the sys I/F structure will be built like this: |---temp: 37000 |---mode: enabled |---policy: step_wise + |---available_policies: step_wise fair_share |---trip_point_0_temp: 100000 |---trip_point_0_type: critical |---trip_point_1_temp: 80000 diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 962de1847cc0..68a603a3d4ed 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -847,6 +847,27 @@ policy_show(struct device *dev, struct device_attribute *devattr, char *buf) return sprintf(buf, "%s\n", tz->governor->name); } +static ssize_t +available_policies_show(struct device *dev, struct device_attribute *devattr, + char *buf) +{ + struct thermal_governor *pos; + ssize_t count = 0; + ssize_t size; + + mutex_lock(&thermal_governor_lock); + + list_for_each_entry(pos, &thermal_governor_list, governor_list) { + size = PAGE_SIZE - count; + count += scnprintf(buf + count, size, "%s ", pos->name); + } + count += scnprintf(buf + count, size, "\n"); + + mutex_unlock(&thermal_governor_lock); + + return count; +} + #ifdef CONFIG_THERMAL_EMULATION static ssize_t emul_temp_store(struct device *dev, struct device_attribute *attr, @@ -1028,6 +1049,7 @@ static DEVICE_ATTR(temp, 0444, temp_show, NULL); static DEVICE_ATTR(mode, 0644, mode_show, mode_store); static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, passive_store); static DEVICE_ATTR(policy, S_IRUGO | S_IWUSR, policy_show, policy_store); +static DEVICE_ATTR(available_policies, S_IRUGO, available_policies_show, NULL); /* sys I/F for cooling device */ #define to_cooling_device(_dev) \ @@ -1813,6 +1835,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, if (result) goto unregister; + /* Create available_policies attribute */ + result = device_create_file(&tz->device, &dev_attr_available_policies); + if (result) + goto unregister; + /* Update 'this' zone's governor information */ mutex_lock(&thermal_governor_lock); @@ -1913,6 +1940,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) if (tz->ops->get_mode) device_remove_file(&tz->device, &dev_attr_mode); device_remove_file(&tz->device, &dev_attr_policy); + device_remove_file(&tz->device, &dev_attr_available_policies); remove_trip_attrs(tz); thermal_set_governor(tz, NULL);
The Linux thermal framework support to change thermal governor policy in userspace, but it can't show what available policies supported. This patch adds available_policies attribute to the thermal framework, it can list the thermal governors which can be used for a particular zone. This attribute is read only. Signed-off-by: Wei Ni <wni@nvidia.com> --- v2: This change had been submitted and discussed in http://marc.info/?l=linux-tegra&m=138961183931457&w=2 https://www.marc.info/?l=linux-pm&m=138986468007449&w=1 cherry-picked it,and updated to this v2 version. Documentation/thermal/sysfs-api.txt | 6 ++++++ drivers/thermal/thermal_core.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+)