On 四, 2016-06-16 at 11:27 +0800, Zhang Rui wrote:
> On 一, 2016-05-30 at 23:18 -0700, Eduardo Valentin wrote:
> >
> > This patch moves the passive attribute to tz->device.groups. Moving
> > the
> > passive attribute also requires a .is_visible() callback
> > implementation
> > for its attribute group.
> >
> > The logic behind the visibility of passive attribute is kept the
> > same.
> > We only expose the passive attribute if the thermal driver has
> > exposed
> > at least one passive trip point.
> >
> No, the passive attribute is only present for zones in which the
> passive cooling policy is not supported by native thermal driver.
>
> >
> > Cc: Zhang Rui <rui.zh...@intel.com>
> > Cc: linux...@vger.kernel.org
> > Cc: linux-kernel@vger.kernel.org
> > Signed-off-by: Eduardo Valentin <edubez...@gmail.com>
> > ---
> > drivers/thermal/thermal_core.c | 42
> > +++++++++++++++++++++++++++++++++---------
> > 1 file changed, 33 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/thermal/thermal_core.c
> > b/drivers/thermal/thermal_core.c
> > index 19fea9e..efc190c 100644
> > --- a/drivers/thermal/thermal_core.c
> > +++ b/drivers/thermal/thermal_core.c
> > @@ -1056,9 +1056,42 @@ static struct attribute_group
> > thermal_zone_mode_attribute_group = {
> > .is_visible = thermal_zone_mode_is_visible,
> > };
> >
> > +/* We expose passive only if passive trips are present */
> > +static struct attribute *thermal_zone_passive_attrs[] = {
> > + &dev_attr_passive.attr,
> > + NULL,
> > +};
> > +
> > +static umode_t thermal_zone_passive_is_visible(struct kobject
> > *kobj,
> > + struct attribute
> > *attr,
> > + int attrno)
> > +{
> > + struct device *dev = container_of(kobj, struct device,
> > kobj);
> > + struct thermal_zone_device *tz;
> > + enum thermal_trip_type trip_type;
> > + int count;
> > +
> > + tz = container_of(dev, struct thermal_zone_device,
> > device);
> > +
> > + for (count = 0; count < tz->trips; count++) {
> > + tz->ops->get_trip_type(tz, count, &trip_type);
> > +
> > + if (trip_type == THERMAL_TRIP_PASSIVE)
> > + return attr->mode;
> we should
> return 0;
> >
> > + }
> > +
> > + return 0;
> and
> return attr->mode;
>
refreshed patch attached, please review.
>From 98415315a7ce1027d2e788476980b7815d9e9627 Mon Sep 17 00:00:00 2001
From: Eduardo Valentin <edubez...@gmail.com>
Date: Mon, 30 May 2016 23:18:14 -0700
Subject: [PATCH] thermal: core: move passive attr to tz->device.groups
This patch moves the passive attribute to tz->device.groups. Moving the
passive attribute also requires a .is_visible() callback implementation
for its attribute group.
The logic behind the visibility of passive attribute is kept the same.
We only expose the passive attribute if the thermal driver has exposed
at least one passive trip point.
Cc: Zhang Rui <rui.zh...@intel.com>
Cc: linux...@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubez...@gmail.com>
Signed-off-by: Zhang Rui <rui.zh...@intel.com>
---
drivers/thermal/thermal_core.c | 42 +++++++++++++++++++++++++++++++++---------
1 file changed, 33 insertions(+), 9 deletions(-)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 19fea9e..40299a0 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1056,9 +1056,42 @@ static struct attribute_group
thermal_zone_mode_attribute_group = {
.is_visible = thermal_zone_mode_is_visible,
};
+/* We expose passive only if passive trips are present */
+static struct attribute *thermal_zone_passive_attrs[] = {
+ &dev_attr_passive.attr,
+ NULL,
+};
+
+static umode_t thermal_zone_passive_is_visible(struct kobject *kobj,
+ struct attribute *attr,
+ int attrno)
+{
+ struct device *dev = container_of(kobj, struct device, kobj);
+ struct thermal_zone_device *tz;
+ enum thermal_trip_type trip_type;
+ int count;
+
+ tz = container_of(dev, struct thermal_zone_device, device);
+
+ for (count = 0; count < tz->trips; count++) {
+ tz->ops->get_trip_type(tz, count, &trip_type);
+
+ if (trip_type == THERMAL_TRIP_PASSIVE)
+ return 0;
+ }
+
+ return attr->mode;
+}
+
+static struct attribute_group thermal_zone_passive_attribute_group = {
+ .attrs = thermal_zone_passive_attrs,
+ .is_visible = thermal_zone_passive_is_visible,
+};
+
static const struct attribute_group *thermal_zone_attribute_groups[] = {
&thermal_zone_attribute_group,
&thermal_zone_mode_attribute_group,
+ &thermal_zone_passive_attribute_group,
NULL
};
@@ -1843,7 +1876,6 @@ struct thermal_zone_device
*thermal_zone_device_register(const char *type,
int trip_temp;
int result;
int count;
- int passive = 0;
struct thermal_governor *governor;
if (!type || strlen(type) == 0)
@@ -1904,8 +1936,6 @@ struct thermal_zone_device
*thermal_zone_device_register(const char *type,
for (count = 0; count < trips; count++) {
if (tz->ops->get_trip_type(tz, count, &trip_type))
set_bit(count, &tz->trips_disabled);
- if (trip_type == THERMAL_TRIP_PASSIVE)
- passive = 1;
if (tz->ops->get_trip_temp(tz, count, &trip_temp))
set_bit(count, &tz->trips_disabled);
/* Check for bogus trip points */
@@ -1913,12 +1943,6 @@ struct thermal_zone_device
*thermal_zone_device_register(const char *type,
set_bit(count, &tz->trips_disabled);
}
- if (!passive) {
- result = device_create_file(&tz->device, &dev_attr_passive);
- if (result)
- goto unregister;
- }
-
/* Update 'this' zone's governor information */
mutex_lock(&thermal_governor_lock);
--
2.7.4
