From patchwork Mon Mar 14 18:12:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srikar Srimath Tirumala X-Patchwork-Id: 597218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qP5T101wXz9t3V for ; Tue, 15 Mar 2016 05:12:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932222AbcCNSMr (ORCPT ); Mon, 14 Mar 2016 14:12:47 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:5136 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932203AbcCNSMo (ORCPT ); Mon, 14 Mar 2016 14:12:44 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com id ; Mon, 14 Mar 2016 11:13:04 -0700 Received: from hqemhub02.nvidia.com ([172.20.12.94]) by hqnvupgp08.nvidia.com (PGP Universal service); Mon, 14 Mar 2016 11:11:58 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Mon, 14 Mar 2016 11:11:58 -0700 Received: from srikars-mint.nvidia.com (172.20.144.16) by hqemhub02.nvidia.com (172.20.150.31) with Microsoft SMTP Server id 8.3.406.0; Mon, 14 Mar 2016 11:12:42 -0700 From: Srikar Srimath Tirumala To: linux-pm@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, mlongnecker@nvidia.com CC: Srikar Srimath Tirumala Subject: [PATCH v2] thermal: add sysfs_notify on some attributes Date: Mon, 14 Mar 2016 11:12:36 -0700 Message-ID: <1457979156-10972-1-git-send-email-srikars@nvidia.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org Add a sysfs_notify on thermal_zone*/temp and cooling_device*/ cur_state whenever any trip is triggered or cur state is changed. This change allows usermode apps to register themselves to get notified, when certain thermal conditions occur and reduce their workload. This workload throttling allows usermode to react before hardware clocks are throttled and keep some critical apps running reliably longer. Signed-off-by: Srikar Srimath Tirumala --- Changes from v1: - Calling sysfs_notify for thermal_zone*/temp only when there is a trip violated on the thermal zone. - Modified commit message. drivers/thermal/thermal_core.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index a0a8fd1..f54519e 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -419,14 +419,23 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz) mutex_unlock(&tz->lock); } -static void handle_non_critical_trips(struct thermal_zone_device *tz, +static int handle_non_critical_trips(struct thermal_zone_device *tz, int trip, enum thermal_trip_type trip_type) { + int trip_temp; + int ret = 0; + tz->governor ? tz->governor->throttle(tz, trip) : def_governor->throttle(tz, trip); + + tz->ops->get_trip_temp(tz, trip, &trip_temp); + if (tz->temperature >= trip_temp) + ret = 1; + + return ret; } -static void handle_critical_trips(struct thermal_zone_device *tz, +static int handle_critical_trips(struct thermal_zone_device *tz, int trip, enum thermal_trip_type trip_type) { int trip_temp; @@ -435,7 +444,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz, /* If we have not crossed the trip_temp, we do not care. */ if (trip_temp <= 0 || tz->temperature < trip_temp) - return; + return 0; trace_thermal_zone_trip(tz, trip, trip_type); @@ -448,23 +457,28 @@ static void handle_critical_trips(struct thermal_zone_device *tz, tz->temperature / 1000); orderly_poweroff(true); } + + return 1; } -static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) +static int handle_thermal_trip(struct thermal_zone_device *tz, int trip) { + int ret = 0; enum thermal_trip_type type; tz->ops->get_trip_type(tz, trip, &type); if (type == THERMAL_TRIP_CRITICAL || type == THERMAL_TRIP_HOT) - handle_critical_trips(tz, trip, type); + ret = handle_critical_trips(tz, trip, type); else - handle_non_critical_trips(tz, trip, type); + ret = handle_non_critical_trips(tz, trip, type); /* * Alright, we handled this trip successfully. * So, start monitoring again. */ monitor_thermal_zone(tz); + + return ret; } /** @@ -556,7 +570,7 @@ static void thermal_zone_device_reset(struct thermal_zone_device *tz) void thermal_zone_device_update(struct thermal_zone_device *tz) { int count; - + int trips = 0; if (atomic_read(&in_suspend)) return; @@ -566,7 +580,10 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) update_temperature(tz); for (count = 0; count < tz->trips; count++) - handle_thermal_trip(tz, count); + trips += handle_thermal_trip(tz, count); + + if (trips) + sysfs_notify(&tz->device.kobj, NULL, "temp"); } EXPORT_SYMBOL_GPL(thermal_zone_device_update); @@ -1638,6 +1655,7 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev) cdev->updated = true; trace_cdev_update(cdev, target); dev_dbg(&cdev->device, "set to state %lu\n", target); + sysfs_notify(&cdev->device.kobj, NULL, "cur_state"); } EXPORT_SYMBOL(thermal_cdev_update);