From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eduardo Valentin Subject: Re: [PATCH V4 05/13] Thermal: Remove tc1/tc2 in generic thermal layer. Date: Tue, 21 Aug 2012 17:20:14 +0300 Message-ID: <20120821142014.GB5030@besouro> References: <1343292083-2047-1-git-send-email-rui.zhang@intel.com> <1343292083-2047-6-git-send-email-rui.zhang@intel.com> <1344473874.1682.644.camel@rui.sh.intel.com> <20120820121842.GA9833@besouro> <1345510182.1682.927.camel@rui.sh.intel.com> Reply-To: eduardo.valentin@ti.com Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from na3sys009aog132.obsmtp.com ([74.125.149.250]:59462 "EHLO na3sys009aog132.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753874Ab2HUOU1 (ORCPT ); Tue, 21 Aug 2012 10:20:27 -0400 Received: by obbwd20 with SMTP id wd20so14983036obb.23 for ; Tue, 21 Aug 2012 07:20:23 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1345510182.1682.927.camel@rui.sh.intel.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Zhang Rui Cc: eduardo.valentin@ti.com, "Rafael J. Wysocki" , Matthew Garrett , Len Brown , R Durgadoss , Amit Kachhap , Wei Ni , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Hello, On Tue, Aug 21, 2012 at 08:49:42AM +0800, Zhang Rui wrote: > On =E4=B8=80, 2012-08-20 at 15:18 +0300, Eduardo Valentin wrote: > > Hello, > >=20 > > On Thu, Aug 09, 2012 at 06:10:04PM +0300, Valentin, Eduardo wrote: > > >=20 > > > (resending the mail so that it reaches the mailing lists) > > >=20 > > > Nice, I checked your tree and this patch is fine for me. Next tim= e you > > > send it out, you may want to add my reviewed-by: > >=20 > > Except that in your tree it is still introducing compilation issues= under omap-thermal-common.c > >=20 > why, I think I have fixed that already. > would you please send an incremental patch so that I can apply it? =46YI, I sent as reply to your patch 0/13 a plain diff of including the= needed changes in order to keep the code in one piece after this series. But as the driver is under staging, maybe it makes sense to send this c= hange separately, to Greg K. Posting here anyway: diff --git a/drivers/staging/omap-thermal/omap-thermal-common.c b/drive= rs/staging/omap-thermal/omap-thermal-common.c index 0675a5e..b4cd6cc 100644 --- a/drivers/staging/omap-thermal/omap-thermal-common.c +++ b/drivers/staging/omap-thermal/omap-thermal-common.c @@ -120,7 +120,9 @@ static int omap_thermal_bind(struct thermal_zone_de= vice *thermal, =20 /* TODO: bind with min and max states */ /* Simple thing, two trips, one passive another critical */ - return thermal_zone_bind_cooling_device(thermal, 0, cdev); + return thermal_zone_bind_cooling_device(thermal, 0, cdev, + THERMAL_NO_LIMIT, + THERMAL_NO_LIMIT); } =20 /* Unbind callback functions for thermal zone */ @@ -246,7 +248,7 @@ int omap_thermal_expose_sensor(struct omap_bandgap = *bg_ptr, int id, /* Create thermal zone */ data->omap_thermal =3D thermal_zone_device_register(domain, OMAP_TRIP_NUMBER, 0, data, &omap_therma= l_ops, - 0, FAST_TEMP_MONITORING_RATE, 0, 0); + 0, FAST_TEMP_MONITORING_RATE); if (IS_ERR_OR_NULL(data->omap_thermal)) { dev_err(bg_ptr->dev, "thermal zone device is NULL\n"); return PTR_ERR(data->omap_thermal); >=20 > thanks, > rui > > >=20 > > > Reviewed-by: Eduardo Valentin > >=20 > > So, apart from the above comment, this patch is still fine for me. > >=20 > > >=20 > > >=20 > > > > > > > > thanks, > > > > rui > > > > > Apart from the compilation issues and the needed patch refres= h, I am > > > > > good with the patch. And thanks for pushing this forward. > > > > > > > > > > > 6 files changed, 11 insertions(+), 29 deletions(-) > > > > > > > > > > > > diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.= c > > > > > > index 0c49e42..0c755d2 100644 > > > > > > --- a/drivers/acpi/thermal.c > > > > > > +++ b/drivers/acpi/thermal.c > > > > > > @@ -895,15 +895,12 @@ static int > > > > > > acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) > > > > > > tz->thermal_zone =3D > > > > > > thermal_zone_device_register("acpit= z", trips, > > > > > > 0, tz, > > > > > > > > > > > > &acpi_thermal_zone_ops, > > > > > > - > > > > > > tz->trips.passive.tc1, > > > > > > - > > > > > > tz->trips.passive.tc2, > > > > > > > > > > > > tz->trips.passive.tsp*100, > > > > > > > > > > > > tz->polling_frequency*100); > > > > > > else > > > > > > tz->thermal_zone =3D > > > > > > thermal_zone_device_register("acpit= z", trips, > > > > > > 0, tz, > > > > > > - > > > > > > &acpi_thermal_zone_ops, > > > > > > - 0, 0, = 0, > > > > > > + > > > > > > &acpi_thermal_zone_ops, 0, > > > > > > > > > > > > tz->polling_frequency*100); > > > > > > if (IS_ERR(tz->thermal_zone)) > > > > > > return -ENODEV; > > > > > > diff --git a/drivers/platform/x86/acerhdf.c > > > > > > b/drivers/platform/x86/acerhdf.c > > > > > > index a207466..84c5688 100644 > > > > > > --- a/drivers/platform/x86/acerhdf.c > > > > > > +++ b/drivers/platform/x86/acerhdf.c > > > > > > @@ -662,7 +662,7 @@ static int acerhdf_register_thermal(voi= d) > > > > > > return -EINVAL; > > > > > > > > > > > > thz_dev =3D thermal_zone_device_register("acerhdf",= 1, 0, NULL, > > > > > > - &acerhdf_dev_= ops, 0, 0, > > > > > > 0, > > > > > > + &acerhdf_dev_= ops, 0, > > > > > > (kernelmode) = ? > > > > > > interval*1000 : 0); > > > > > > if (IS_ERR(thz_dev)) > > > > > > return -EINVAL; > > > > > > diff --git a/drivers/platform/x86/intel_mid_thermal.c > > > > > > b/drivers/platform/x86/intel_mid_thermal.c > > > > > > index 2b2c212..6e309dd 100644 > > > > > > --- a/drivers/platform/x86/intel_mid_thermal.c > > > > > > +++ b/drivers/platform/x86/intel_mid_thermal.c > > > > > > @@ -499,7 +499,7 @@ static int mid_thermal_probe(struct > > > > > > platform_device *pdev) > > > > > > goto err; > > > > > > } > > > > > > pinfo->tzd[i] =3D thermal_zone_device_regis= ter(name[i], > > > > > > - 0, 0, td_info, &tzd_ops, 0,= 0, 0, 0); > > > > > > + 0, 0, td_info, &tzd_ops, 0,= 0); > > > > > > if (IS_ERR(pinfo->tzd[i])) { > > > > > > kfree(td_info); > > > > > > ret =3D PTR_ERR(pinfo->tzd[i]); > > > > > > diff --git a/drivers/thermal/spear_thermal.c > > > > > > b/drivers/thermal/spear_thermal.c > > > > > > index 69a55d4..b55840a 100644 > > > > > > --- a/drivers/thermal/spear_thermal.c > > > > > > +++ b/drivers/thermal/spear_thermal.c > > > > > > @@ -148,7 +148,7 @@ static int spear_thermal_probe(struct > > > > > > platform_device *pdev) > > > > > > writel_relaxed(stdev->flags, stdev->thermal_base); > > > > > > > > > > > > spear_thermal =3D thermal_zone_device_register("spe= ar_thermal", > > > > > > 0, 0, > > > > > > - stdev, &ops, 0, 0, 0, 0); > > > > > > + stdev, &ops, 0, 0); > > > > > > if (IS_ERR(spear_thermal)) { > > > > > > dev_err(&pdev->dev, "thermal zone device is= NULL\n"); > > > > > > ret =3D PTR_ERR(spear_thermal); > > > > > > diff --git a/drivers/thermal/thermal_sys.c > > > > > > b/drivers/thermal/thermal_sys.c > > > > > > index 68c93d4..a70ed4c 100644 > > > > > > --- a/drivers/thermal/thermal_sys.c > > > > > > +++ b/drivers/thermal/thermal_sys.c > > > > > > @@ -335,9 +335,6 @@ passive_store(struct device *dev, struc= t > > > > > > device_attribute *attr, > > > > > > tz->passive_delay =3D 0; > > > > > > } > > > > > > > > > > > > - tz->tc1 =3D 1; > > > > > > - tz->tc2 =3D 1; > > > > > > - > > > > > > tz->forced_passive =3D state; > > > > > > > > > > > > thermal_zone_device_update(tz); > > > > > > @@ -718,13 +715,12 @@ static void > > > > > > thermal_zone_device_set_polling(struct thermal_zone_device = *tz, > > > > > > static void thermal_zone_device_passive(struct thermal_zon= e_device > > > > > > *tz, > > > > > > int temp, int trip_= temp, int > > > > > > trip) > > > > > > { > > > > > > - int trend =3D 0; > > > > > > + enum thermal_trend trend; > > > > > > struct thermal_cooling_device_instance *instance; > > > > > > struct thermal_cooling_device *cdev; > > > > > > long state, max_state; > > > > > > > > > > > > - if (!tz->ops->get_trend || > > > > > > - tz->ops->get_trend(tz, trip, (enum thermal_tren= d > > > > > > *)&trend)) { > > > > > > + if (!tz->ops->get_trend || tz->ops->get_trend(tz, t= rip, > > > > > > &trend)) { > > > > > > /* > > > > > > * compare the current temperature and prev= ious > > > > > > temperature > > > > > > * to get the thermal trend, if no special = requirement > > > > > > @@ -747,11 +743,8 @@ static void thermal_zone_device_passiv= e(struct > > > > > > thermal_zone_device *tz, > > > > > > if (temp >=3D trip_temp) { > > > > > > tz->passive =3D true; > > > > > > > > > > > > - trend =3D (tz->tc1 * (temp - tz->last_tempe= rature)) + > > > > > > - (tz->tc2 * (temp - trip_temp)); > > > > > > - > > > > > > /* Heating up? */ > > > > > > - if (trend > 0) { > > > > > > + if (trend =3D=3D THERMAL_TREND_RAISING) { > > > > > > list_for_each_entry(instance, > > > > > > &tz->cooling_devices, > > > > > > node) { > > > > > > if (instance->trip !=3D tri= p) > > > > > > @@ -762,7 +755,7 @@ static void thermal_zone_device_passive= (struct > > > > > > thermal_zone_device *tz, > > > > > > if (state++ < max_state) > > > > > > cdev->ops->set_cur_= state(cdev, > > > > > > state); > > > > > > } > > > > > > - } else if (trend < 0) { /* Cooling off? */ > > > > > > + } else if (trend =3D=3D THERMAL_TREND_DROPP= ING) { /* > > > > > > Cooling off? */ > > > > > > list_for_each_entry(instance, > > > > > > &tz->cooling_devices, > > > > > > node) { > > > > > > if (instance->trip !=3D tri= p) > > > > > > @@ -1288,8 +1281,6 @@ static void remove_trip_attrs(struct > > > > > > thermal_zone_device *tz) > > > > > > * @mask: a bit string indicating the writeablility o= f trip > > > > > > points > > > > > > * @devdata: private device data > > > > > > * @ops: standard thermal zone device callbacks > > > > > > - * @tc1: thermal coefficient 1 for passive calculati= ons > > > > > > - * @tc2: thermal coefficient 2 for passive calculati= ons > > > > > > * @passive_delay: number of milliseconds to wait between = polls when > > > > > > * performing passive cooling > > > > > > * @polling_delay: number of milliseconds to wait between = polls when > > > > > > checking > > > > > > @@ -1297,13 +1288,12 @@ static void remove_trip_attrs(struc= t > > > > > > thermal_zone_device *tz) > > > > > > * driven systems) > > > > > > * > > > > > > * thermal_zone_device_unregister() must be called when th= e device is > > > > > > no > > > > > > - * longer needed. The passive cooling formula uses tc1 and= tc2 as > > > > > > described in > > > > > > - * section 11.1.5.1 of the ACPI specification 3.0. > > > > > > + * longer needed. The passive cooling depends on the .get_= trend() > > > > > > return value. > > > > > > */ > > > > > > struct thermal_zone_device *thermal_zone_device_register(c= har *type, > > > > > > int trips, int mask, void *devdata, > > > > > > const struct thermal_zone_device_ops *ops, > > > > > > - int tc1, int tc2, int passive_delay, int polling_de= lay) > > > > > > + int passive_delay, int polling_delay) > > > > > > { > > > > > > struct thermal_zone_device *tz; > > > > > > struct thermal_cooling_device *pos; > > > > > > @@ -1339,8 +1329,6 @@ struct thermal_zone_device > > > > > > *thermal_zone_device_register(char *type, > > > > > > tz->device.class =3D &thermal_class; > > > > > > tz->devdata =3D devdata; > > > > > > tz->trips =3D trips; > > > > > > - tz->tc1 =3D tc1; > > > > > > - tz->tc2 =3D tc2; > > > > > > tz->passive_delay =3D passive_delay; > > > > > > tz->polling_delay =3D polling_delay; > > > > > > > > > > > > diff --git a/include/linux/thermal.h b/include/linux/therma= l.h > > > > > > index a01e3e6..d18dcf6 100644 > > > > > > --- a/include/linux/thermal.h > > > > > > +++ b/include/linux/thermal.h > > > > > > @@ -115,8 +115,6 @@ struct thermal_zone_device { > > > > > > struct thermal_attr *trip_hyst_attrs; > > > > > > void *devdata; > > > > > > int trips; > > > > > > - int tc1; > > > > > > - int tc2; > > > > > > int passive_delay; > > > > > > int polling_delay; > > > > > > int temperature; > > > > > > @@ -163,8 +161,7 @@ enum { > > > > > > #define THERMAL_GENL_CMD_MAX (__THERMAL_GENL_CMD_MAX - 1) > > > > > > > > > > > > struct thermal_zone_device *thermal_zone_device_register(c= har *, int, > > > > > > int, > > > > > > - void *, const struct thermal_zone_device_op= s *, int > > > > > > tc1, > > > > > > - int tc2, int passive_freq, int polling_freq= ); > > > > > > + void *, const struct thermal_zone_device_op= s *, int, > > > > > > int); > > > > > > void thermal_zone_device_unregister(struct thermal_zone_de= vice *); > > > > > > > > > > > > int thermal_zone_bind_cooling_device(struct thermal_zone_d= evice *, > > > > > > int, > > > > > > -- > > > > > > 1.7.9.5 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >=20 > > >=20 > > >=20 > > > -- > > >=20 > > > Eduardo Valentin >=20 >=20 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" i= n the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html