On 三, 2012-07-25 at 22:19 +0200, Rafael J. Wysocki wrote:
> On Wednesday, July 25, 2012, Zhang Rui wrote:
> > tc1 and tc2 are used by OSPM to anticipate the temperature trends.
> > But they are ACPI platform specific concepts.
> >
> > Introduce .get_trend() as a more general solution.
> >
> > Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
> > ---
> > drivers/acpi/thermal.c | 33 +++++++++++++++++++++++++++++++++
> > drivers/thermal/thermal_sys.c | 22 ++++++++++++++++++++--
> > include/linux/thermal.h | 9 +++++++++
> > 3 files changed, 62 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
> > index 0154eac..01c92fd 100644
> > --- a/drivers/acpi/thermal.c
> > +++ b/drivers/acpi/thermal.c
> > @@ -704,6 +704,38 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal,
> > return -EINVAL;
> > }
> >
> > +static int thermal_get_trend(struct thermal_zone_device *thermal,
> > + int trip, enum thermal_trend *trend)
> > +{
> > + struct acpi_thermal *tz = thermal->devdata;
> > + enum thermal_trip_type type;
> > + int i;
> > +
> > + if (thermal_get_trip_type(thermal, trip, &type))
> > + return -EINVAL;
> > +
> > + /* Only PASSIVE trip points need TREND */
> > + if (type != THERMAL_TRIP_PASSIVE)
> > + return -EINVAL;
> > +
> > + /*
> > + * tz->temperature has already been updated by generic thermal layer,
> > + * before this callback being invoked
> > + */
> > + i = (tz->trips.passive.tc1 * (tz->temperature - tz->last_temperature))
> > + + (tz->trips.passive.tc2
> > + * (tz->temperature - tz->trips.passive.temperature));
> > +
> > + if (i > 0)
> > + *trend = THERMAL_TREND_RAISING;
> > + else if (i < 0)
> > + *trend = THERMAL_TREND_DROPPING;
> > + else
> > + *trend = THERMAL_TREND_STABLE;
> > + return 0;
> > +}
> > +
> > +
> > static int thermal_notify(struct thermal_zone_device *thermal, int trip,
> > enum thermal_trip_type trip_type)
> > {
> > @@ -836,6 +868,7 @@ static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {
> > .get_trip_type = thermal_get_trip_type,
> > .get_trip_temp = thermal_get_trip_temp,
> > .get_crit_temp = thermal_get_crit_temp,
> > + .get_trend = thermal_get_trend,
> > .notify = thermal_notify,
> > };
> >
> > diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
> > index 62b4279..d406524 100644
> > --- a/drivers/thermal/thermal_sys.c
> > +++ b/drivers/thermal/thermal_sys.c
> > @@ -699,6 +699,21 @@ thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
> > }
> > #endif
> >
> > +static void thermal_get_trend(struct thermal_zone_device *tz,
> > + int trip, enum thermal_trend *trend)
> > +{
> > + if (tz->ops->get_trend && !tz->ops->get_trend(tz, trip, trend))
> > + return;
> > +
> > + if (tz->temperature > tz->last_temperature)
> > + *trend = THERMAL_TREND_RAISING;
> > + else if (tz->temperature < tz->last_temperature)
> > + *trend = THERMAL_TREND_DROPPING;
> > + else
> > + *trend = THERMAL_TREND_STABLE;
> > + return;
> > +}
> > +
>
> As I said in the review of the previous version of this patch series, I think
> that the code from the function above should go directly into
> thermal_zone_device_passive(). The ugly pointer manipulations would be
> avoidable in that case and the code would be cleaner overall in my opinion.
>
agreed.
thanks,
rui
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
