Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757756Ab3DKUs1 (ORCPT ); Thu, 11 Apr 2013 16:48:27 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:41673 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752355Ab3DKUsZ (ORCPT ); Thu, 11 Apr 2013 16:48:25 -0400 Message-ID: <51672183.3030109@ti.com> Date: Thu, 11 Apr 2013 16:48:03 -0400 From: Eduardo Valentin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: Amit Daniel Kachhap CC: , Thomas Abraham , Zhang Rui , , , , Kukjin Kim , Subject: Re: [5/9] thermal: exynos: Make the zone handling dependent on trip count References: <1364297642-2746-6-git-send-email-amit.daniel@samsung.com> In-Reply-To: <1364297642-2746-6-git-send-email-amit.daniel@samsung.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7065 Lines: 209 On 26-03-2013 07:33, Amit Daniel Kachhap wrote: > This code changes the zone handling to use the trip count passed > by the TMU driver. This also helps in adding more zone support. > > Signed-off-by: Amit Daniel Kachhap > > --- > drivers/thermal/samsung/exynos_common.c | 56 +++++++++++++------------ > drivers/thermal/samsung/exynos_common.h | 13 +++--- > include/linux/platform_data/exynos_thermal.h | 7 ++- > 3 files changed, 40 insertions(+), 36 deletions(-) > > diff --git a/drivers/thermal/samsung/exynos_common.c b/drivers/thermal/samsung/exynos_common.c > index 649d67c..0c0098d 100644 > --- a/drivers/thermal/samsung/exynos_common.c > +++ b/drivers/thermal/samsung/exynos_common.c > @@ -84,17 +84,16 @@ static int exynos_set_mode(struct thermal_zone_device *thermal, > static int exynos_get_trip_type(struct thermal_zone_device *thermal, int trip, > enum thermal_trip_type *type) > { > - switch (GET_ZONE(trip)) { > - case MONITOR_ZONE: > - case WARN_ZONE: > - *type = THERMAL_TRIP_ACTIVE; > - break; > - case PANIC_ZONE: > - *type = THERMAL_TRIP_CRITICAL; > - break; > - default: > + struct exynos_thermal_zone *th_zone = thermal->devdata; > + int max_trip = th_zone->sensor_conf->trip_data.trip_count; > + > + if (trip < 0 || trip >= max_trip) > return -EINVAL; > - } > + else if (trip == (max_trip - 1)) > + *type = THERMAL_TRIP_CRITICAL; > + else > + *type = THERMAL_TRIP_ACTIVE; > + > return 0; > } > > @@ -103,8 +102,9 @@ static int exynos_get_trip_temp(struct thermal_zone_device *thermal, int trip, > unsigned long *temp) > { > struct exynos_thermal_zone *th_zone = thermal->devdata; > + int max_trip = th_zone->sensor_conf->trip_data.trip_count; > > - if (trip < GET_TRIP(MONITOR_ZONE) || trip > GET_TRIP(PANIC_ZONE)) > + if (trip < 0 || trip >= max_trip) > return -EINVAL; > > *temp = th_zone->sensor_conf->trip_data.trip_val[trip]; > @@ -118,10 +118,10 @@ static int exynos_get_trip_temp(struct thermal_zone_device *thermal, int trip, > static int exynos_get_crit_temp(struct thermal_zone_device *thermal, > unsigned long *temp) > { > - int ret; > - /* Panic zone */ > - ret = exynos_get_trip_temp(thermal, GET_TRIP(PANIC_ZONE), temp); > - return ret; > + struct exynos_thermal_zone *th_zone = thermal->devdata; > + int max_trip = th_zone->sensor_conf->trip_data.trip_count; > + /* Get the temp of highest trip*/ > + return exynos_get_trip_temp(thermal, max_trip - 1, temp); > } > > int exynos_get_frequency_level(unsigned int cpu, unsigned int freq) > @@ -157,7 +157,7 @@ static int exynos_bind(struct thermal_zone_device *thermal, > tab_size = data->cooling_data.freq_clip_count; > > if (tab_ptr == NULL || tab_size == 0) > - return -EINVAL; > + return 0; > > /* find the cooling device registered*/ > for (i = 0; i < th_zone->cool_dev_size; i++) > @@ -206,7 +206,7 @@ static int exynos_unbind(struct thermal_zone_device *thermal, > tab_size = data->cooling_data.freq_clip_count; > > if (tab_size == 0) > - return -EINVAL; > + return 0; > > /* find the cooling device registered*/ > for (i = 0; i < th_zone->cool_dev_size; i++) The above two chunks are confusing. I dont understand how they are now supposed to be valid settings. > @@ -366,19 +366,21 @@ int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) > return -ENOMEM; > > th_zone->sensor_conf = sensor_conf; > - cpumask_set_cpu(0, &mask_val); > - th_zone->cool_dev[0] = cpufreq_cooling_register(&mask_val); > - if (IS_ERR(th_zone->cool_dev[0])) { > - pr_err("Failed to register cpufreq cooling device\n"); > - ret = -EINVAL; > - goto err_unregister; > + if (sensor_conf->cooling_data.freq_clip_count > 0) { > + cpumask_set_cpu(0, &mask_val); > + th_zone->cool_dev[0] = cpufreq_cooling_register(&mask_val); > + if (IS_ERR(th_zone->cool_dev[0])) { > + pr_err("Failed to register cpufreq cooling device\n"); > + ret = -EINVAL; > + goto err_unregister; > + } > + th_zone->cool_dev_size++; > } > - th_zone->cool_dev_size++; > > th_zone->therm_dev = thermal_zone_device_register(sensor_conf->name, > - EXYNOS_ZONE_COUNT, 0, th_zone, &exynos_dev_ops, NULL, 0, > - sensor_conf->trip_data.trigger_falling ? > - 0 : IDLE_INTERVAL); > + sensor_conf->trip_data.trip_count, 0, th_zone, &exynos_dev_ops, > + NULL, 0, sensor_conf->trip_data.trigger_falling ? > + 0 : IDLE_INTERVAL); > > if (IS_ERR(th_zone->therm_dev)) { > pr_err("Failed to register thermal zone device\n"); > diff --git a/drivers/thermal/samsung/exynos_common.h b/drivers/thermal/samsung/exynos_common.h > index b8d289e..453e09a 100644 > --- a/drivers/thermal/samsung/exynos_common.h > +++ b/drivers/thermal/samsung/exynos_common.h > @@ -27,23 +27,22 @@ > #define SENSOR_NAME_LEN 16 > #define MAX_TRIP_COUNT 8 > #define MAX_COOLING_DEVICE 4 > -#define MAX_THRESHOLD_LEVS 4 > +#define MAX_THRESHOLD_LEVS 5 > > #define ACTIVE_INTERVAL 500 > #define IDLE_INTERVAL 10000 > #define MCELSIUS 1000 > > /* CPU Zone information */ > -#define PANIC_ZONE 4 > -#define WARN_ZONE 3 > -#define MONITOR_ZONE 2 > -#define SAFE_ZONE 1 > +#define PANIC_ZONE 5 > +#define ALARM_ZONE 4 > +#define WARN_ZONE 3 > +#define MONITOR_ZONE 2 > +#define SAFE_ZONE 1 > Updating this does not seam to be part of the intent of this patch. You probably want to send a separate patch for this. > #define GET_ZONE(trip) (trip + 2) > #define GET_TRIP(zone) (zone - 2) > > -#define EXYNOS_ZONE_COUNT 3 > - > struct thermal_trip_point_conf { > int trip_val[MAX_TRIP_COUNT]; > int trip_count; > diff --git a/include/linux/platform_data/exynos_thermal.h b/include/linux/platform_data/exynos_thermal.h > index da7e627..893b758 100644 > --- a/include/linux/platform_data/exynos_thermal.h > +++ b/include/linux/platform_data/exynos_thermal.h > @@ -23,6 +23,8 @@ > #define _LINUX_EXYNOS_THERMAL_H > #include > > +#define MAX_TRIP 5 > + Should MAX_TRIP/THRESHOLD_LEVEL/PANIC_ZONE be somewhat same > enum calibration_type { > TYPE_ONE_POINT_TRIMMING, > TYPE_TWO_POINT_TRIMMING, > @@ -100,11 +102,12 @@ struct freq_clip_table { > struct exynos_tmu_platform_data { > u8 threshold; > u8 threshold_falling; > - u8 trigger_levels[4]; > + u8 trigger_levels[MAX_TRIP]; > bool trigger_level0_en; > bool trigger_level1_en; > bool trigger_level2_en; > bool trigger_level3_en; > + bool trigger_level4_en; > > u8 gain; > u8 reference_voltage; > @@ -113,7 +116,7 @@ struct exynos_tmu_platform_data { > > enum calibration_type cal_type; > enum soc_type type; > - struct freq_clip_table freq_tab[4]; > + struct freq_clip_table freq_tab[MAX_TRIP]; > unsigned int freq_tab_count; > }; > #endif /* _LINUX_EXYNOS_THERMAL_H */ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/