From: Eduardo Valentin <edubezval@gmail.com>
To: Rui Zhang <rui.zhang@intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Linux PM <linux-pm@vger.kernel.org>,
Eduardo Valentin <edubezval@gmail.com>
Subject: [PATCHv2 16/49] thermal: core: split passive_store
Date: Mon, 7 Nov 2016 21:08:54 -0800 [thread overview]
Message-ID: <1478581767-7009-17-git-send-email-edubezval@gmail.com> (raw)
In-Reply-To: <1478581767-7009-1-git-send-email-edubezval@gmail.com>
Split passive_store between sysfs handling and thermal
core internal data handling.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
---
drivers/thermal/thermal_core.c | 62 ++++++++++++++++++++++++++++--------------
drivers/thermal/thermal_core.h | 4 +++
2 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 6100ae7..4e315c9 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -720,6 +720,43 @@ int power_actor_set_power(struct thermal_cooling_device *cdev,
return 0;
}
+void thermal_zone_device_rebind_exception(struct thermal_zone_device *tz,
+ const char *cdev_type, size_t size)
+{
+ struct thermal_cooling_device *cdev = NULL;
+
+ mutex_lock(&thermal_list_lock);
+ list_for_each_entry(cdev, &thermal_cdev_list, node) {
+ /* skip non matching cdevs */
+ if (strncmp(cdev_type, cdev->type, size))
+ continue;
+
+ /* re binding the exception matching the type pattern */
+ thermal_zone_bind_cooling_device(tz, THERMAL_TRIPS_NONE, cdev,
+ THERMAL_NO_LIMIT,
+ THERMAL_NO_LIMIT,
+ THERMAL_WEIGHT_DEFAULT);
+ }
+ mutex_unlock(&thermal_list_lock);
+}
+
+void thermal_zone_device_unbind_exception(struct thermal_zone_device *tz,
+ const char *cdev_type, size_t size)
+{
+ struct thermal_cooling_device *cdev = NULL;
+
+ mutex_lock(&thermal_list_lock);
+ list_for_each_entry(cdev, &thermal_cdev_list, node) {
+ /* skip non matching cdevs */
+ if (strncmp(cdev_type, cdev->type, size))
+ continue;
+ /* unbinding the exception matching the type pattern */
+ thermal_zone_unbind_cooling_device(tz, THERMAL_TRIPS_NONE,
+ cdev);
+ }
+ mutex_unlock(&thermal_list_lock);
+}
+
/* sys I/F for thermal zone */
#define to_thermal_zone(_dev) \
@@ -922,7 +959,6 @@ passive_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct thermal_zone_device *tz = to_thermal_zone(dev);
- struct thermal_cooling_device *cdev = NULL;
int state;
if (!sscanf(buf, "%d\n", &state))
@@ -935,30 +971,14 @@ passive_store(struct device *dev, struct device_attribute *attr,
return -EINVAL;
if (state && !tz->forced_passive) {
- mutex_lock(&thermal_list_lock);
- list_for_each_entry(cdev, &thermal_cdev_list, node) {
- if (!strncmp("Processor", cdev->type,
- sizeof("Processor")))
- thermal_zone_bind_cooling_device(tz,
- THERMAL_TRIPS_NONE, cdev,
- THERMAL_NO_LIMIT,
- THERMAL_NO_LIMIT,
- THERMAL_WEIGHT_DEFAULT);
- }
- mutex_unlock(&thermal_list_lock);
if (!tz->passive_delay)
tz->passive_delay = 1000;
+ thermal_zone_device_rebind_exception(tz, "Processor",
+ sizeof("Processor"));
} else if (!state && tz->forced_passive) {
- mutex_lock(&thermal_list_lock);
- list_for_each_entry(cdev, &thermal_cdev_list, node) {
- if (!strncmp("Processor", cdev->type,
- sizeof("Processor")))
- thermal_zone_unbind_cooling_device(tz,
- THERMAL_TRIPS_NONE,
- cdev);
- }
- mutex_unlock(&thermal_list_lock);
tz->passive_delay = 0;
+ thermal_zone_device_unbind_exception(tz, "Processor",
+ sizeof("Processor"));
}
tz->forced_passive = state;
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 749d41a..a765c75 100644
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -56,6 +56,10 @@ struct thermal_instance {
int thermal_register_governor(struct thermal_governor *);
void thermal_unregister_governor(struct thermal_governor *);
+void thermal_zone_device_rebind_exception(struct thermal_zone_device *,
+ const char *, size_t);
+void thermal_zone_device_unbind_exception(struct thermal_zone_device *,
+ const char *, size_t);
#ifdef CONFIG_THERMAL_GOV_STEP_WISE
int thermal_gov_step_wise_register(void);
--
2.1.4
next prev parent reply other threads:[~2016-11-08 5:08 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-08 5:08 [PATCHv2 00/49] thermal: reorganizing thermal core Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 01/49] thermal: core: prevent zones with no types to be registered Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 02/49] thermal: core: group thermal_zone DEVICE_ATTR's declarations Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 03/49] thermal: core: group device_create_file() calls that are always created Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 04/49] thermal: core: use dev.groups to manage always present tz attributes Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 05/49] thermal: core: move emul_temp creation to tz->device.groups Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 06/49] thermal: core: move mode attribute " Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 07/49] thermal: core: move passive attr " Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 08/49] thermal: core: improve power actor documentation Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 09/49] thermal: core: move power actor code out of sysfs I/F section Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 10/49] thermal: core: remove useless empty line Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 11/49] thermal: core: fix style on remove_trip_attrs() Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 12/49] thermal: core: move the trip attrs to the tz sysfs I/F section Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 13/49] thermal: core: create tz->device.groups dynamically Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 14/49] thermal: core: move trips attributes to tz->device.groups Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 15/49] thermal: core: remove unnecessary device_remove() calls Eduardo Valentin
2016-11-08 5:08 ` Eduardo Valentin [this message]
2016-11-08 5:08 ` [PATCHv2 17/49] thermal: core: split policy_store Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 18/49] thermal: core: split available_policies_show() Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 19/49] thermal: core: move to_thermal_zone() macro to header file Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 20/49] thermal: core: treat correctly the return value of *scanf calls Eduardo Valentin
2016-11-08 5:08 ` [PATCHv2 21/49] thermal: core: match parenthesis on code alignment Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 22/49] thermal: core: move thermal_zone sysfs to thermal_sysfs.c Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 23/49] thermal: core: move to_cooling_device macro to header file Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 24/49] thermal: core: move cooling device sysfs to thermal_sysfs.c Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 25/49] thermal: core: remove a couple of style issues on helpers Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 26/49] thermal: core: introduce thermal_helpers.c Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 27/49] thermal: core: group functions related to governor handling Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 28/49] thermal: core: move idr handling to device management section Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 29/49] thermal: core: small style fix on __unbind() helper Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 30/49] thermal: core: move __unbind() helper to where it is used Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 31/49] thermal: core: move bind_cdev() " Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 32/49] thermal: core: move bind_tz() " Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 33/49] thermal: core: fix couple of style issues on __bind() helper Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 34/49] thermal: core: move __bind() to where it is used Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 35/49] thermal: core: add inline to print_bind_err_msg() Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 36/49] thermal: core: move notify to the zone update section Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 37/49] thermal: core: add a comment describing the main update loop Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 38/49] thermal: core: add a comment describing the power actor section Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 39/49] thermal: core: add a comment describing the device management section Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 40/49] thermal: sysfs: remove symbols of emul_temp when config is disabled Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 41/49] thermal: core: remove FSF address in the GPL notice Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 42/49] thermal: core: small style fix when checking for __find_governor() Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 43/49] thermal: core: standardize line breaking alignment Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 44/49] thermal: core: remove void function return statements Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 45/49] thermal: core: remove style warnings and checks Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 46/49] thermal: core: improve kerneldoc entry of thermal_cooling_device_unregister Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 47/49] thermal: core: use kzalloc(sizeof(*ptr),...) Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 48/49] thermal: sysfs: use kcalloc() instead of kzalloc() Eduardo Valentin
2016-11-08 5:09 ` [PATCHv2 49/49] thermal: core: move slop and offset helpers to thermal_helpers.c 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=1478581767-7009-17-git-send-email-edubezval@gmail.com \
--to=edubezval@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.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).