Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757104Ab3HZPvt (ORCPT ); Mon, 26 Aug 2013 11:51:49 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:24086 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757043Ab3HZPvp (ORCPT ); Mon, 26 Aug 2013 11:51:45 -0400 X-AuditID: cbfee61b-b7f776d0000016c8-7a-521b798fc888 From: Lukasz Majewski To: Viresh Kumar , "Rafael J. Wysocki" , Zhang Rui , Eduardo Valentin Cc: "cpufreq@vger.kernel.org" , Linux PM list , Jonghwa Lee , Lukasz Majewski , Lukasz Majewski , linux-kernel , Bartlomiej Zolnierkiewicz , Daniel Lezcano , Kukjin Kim , Myungjoo Ham , durgadoss.r@intel.com Subject: [PATCH v8 3/7] thermal:boost: Automatic enable/disable of BOOST feature Date: Mon, 26 Aug 2013 17:50:39 +0200 Message-id: <1377532243-17076-4-git-send-email-l.majewski@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1377532243-17076-1-git-send-email-l.majewski@samsung.com> References: <1370502472-7249-1-git-send-email-l.majewski@samsung.com> <1377532243-17076-1-git-send-email-l.majewski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrELMWRmVeSWpSXmKPExsVy+t9jQd0JldJBBv2FFhtnrGe1eNr0g91i 3mdZi76fV5gt1uz/yWTRefYJs0XvgqtsFm8ecVu8ebiZ0eLyrjlsFp97jzBa3G5cwWbRv7CX yeLJwz42i41fPRz4PRbvecnkcefaHjaPddPeMnv0bVnF6PFocQujx/Eb25k8Pm+SC2CP4rJJ Sc3JLEst0rdL4MqYtaOBueCAcsWHy51MDYwdsl2MnBwSAiYSO1Y0sULYYhIX7q1n62Lk4hAS mM4oseT7BHaQhJBAF5PEravxIDabgJ7E57tPmUBsEYE5jBJ3jrqDNDALPGCWWPz9CyNIQlgg QOLkxWlgU1kEVCVudSwBG8Qr4CZxrGElE8Q2eYmn9/vYQGxOAXeJU31vmSGWNTFK9K+XmcDI u4CRYRWjaGpBckFxUnqukV5xYm5xaV66XnJ+7iZGcMg+k97BuKrB4hCjAAejEg9vAJt0kBBr YllxZe4hRgkOZiURXo5UoBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHeg63WgUIC6YklqdmpqQWp RTBZJg5OqQbG7ryjLgmiGxI+uZ7dtYbT/emEH4Zh5nvf2U9LbZ+R/NRT2sI/Wk5n8hulg7Id pmHBuUend0yS9JrwRHDFdYvCE2Elj85datHOeb9929nzLY1n7YI6P+THuCt/LhbJ17Z+0bes 50hw0Tl3qdnTN/POS4qeHC+9sM7t1sGdwXfulX2aYblyal67EktxRqKhFnNRcSIAwSFdplUC AAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4647 Lines: 147 This patch provides auto disable/enable operation for boost. When any defined trip point is passed, the boost is disabled. In that moment thermal monitor workqueue is woken up and it monitors if the device temperature drops below 75% of the smallest trip point. When device cools down, the boost is enabled again. Signed-off-by: Lukasz Majewski Signed-off-by: Myungjoo Ham --- Changes for v8: - Move cpufreq_boost_* stub functions definition (needed when cpufreq is not compiled in) to cpufreq.h at cpufreq core support commit Changes for v7: - None Changes for v6: - Disable boost only when supported and enabled - Protect boost related thermal_zone_device struct fields with mutex - Evaluate temperature trend during boost enable decision - Create separate methods to handle boost enable/disable (thermal_boost_{enable|disable}) operations - Boost is disabled at any trip point passage (not only the non critical one) - Add stub definitions for cpufreq boost functions used when CONFIG_CPU_FREQ is NOT defined. Changes for v5: - Move boost disable code from cpu_cooling.c to thermal_core.c (to handle_non_critical_trips) - Extent struct thermal_zone_device by adding overheated bool flag - Implement auto enable of boost after device cools down - Introduce boost_polling flag, which indicates if thermal uses it's predefined pool delay or has woken up thermal workqueue only to wait until device cools down. Changes for v4: - New patch drivers/thermal/thermal_core.c | 55 ++++++++++++++++++++++++++++++++++++++++ include/linux/thermal.h | 2 ++ 2 files changed, 57 insertions(+) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 1f02e8e..8f4be55 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -354,9 +355,59 @@ static void handle_critical_trips(struct thermal_zone_device *tz, } } +static int thermal_boost_enable(struct thermal_zone_device *tz) +{ + enum thermal_trend trend = get_tz_trend(tz, 0); + long trip_temp; + + if (!tz->ops->get_trip_temp || !tz->overheated) + return -EPERM; + if (trend == THERMAL_TREND_RAISING || trend == THERMAL_TREND_RAISE_FULL) + return -EBUSY; + + tz->ops->get_trip_temp(tz, 0, &trip_temp); + /* + * Enable boost again only when current temperature is less + * than 75% of trip_temp[0] + */ + if ((tz->temperature + (trip_temp >> 2)) < trip_temp) { + mutex_lock(&tz->lock); + tz->overheated = false; + if (tz->boost_polling) { + tz->boost_polling = false; + tz->polling_delay = 0; + } + mutex_unlock(&tz->lock); + cpufreq_boost_trigger_state(1); + return 0; + } + return -EBUSY; +} + +static void thermal_boost_disable(struct thermal_zone_device *tz) +{ + cpufreq_boost_trigger_state(0); + + /* + * If no workqueue for monitoring is running - start one with + * 1000 ms monitoring period + * If workqueue already running - do not change its period and only + * test if target CPU has cooled down + */ + mutex_lock(&tz->lock); + if (!tz->polling_delay) { + tz->boost_polling = true; + tz->polling_delay = 1000; + } + tz->overheated = true; + mutex_unlock(&tz->lock); +} + static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) { enum thermal_trip_type type; + if (cpufreq_boost_supported() && cpufreq_boost_enabled()) + thermal_boost_disable(tz); tz->ops->get_trip_type(tz, trip, &type); @@ -455,6 +506,10 @@ static void thermal_zone_device_check(struct work_struct *work) struct thermal_zone_device *tz = container_of(work, struct thermal_zone_device, poll_queue.work); + if (cpufreq_boost_supported()) + if (!thermal_boost_enable(tz)) + return; + thermal_zone_device_update(tz); } diff --git a/include/linux/thermal.h b/include/linux/thermal.h index a386a1c..f1aa3c2 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -172,6 +172,8 @@ struct thermal_zone_device { int emul_temperature; int passive; unsigned int forced_passive; + bool overheated; + bool boost_polling; const struct thermal_zone_device_ops *ops; const struct thermal_zone_params *tzp; struct thermal_governor *governor; -- 1.7.10.4 -- 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/