From patchwork Thu Dec 17 19:13:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 7876381 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 946309F32E for ; Thu, 17 Dec 2015 19:15:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A675C2040F for ; Thu, 17 Dec 2015 19:15:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B77D220117 for ; Thu, 17 Dec 2015 19:15:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754764AbbLQTP1 (ORCPT ); Thu, 17 Dec 2015 14:15:27 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:34650 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754863AbbLQTNg (ORCPT ); Thu, 17 Dec 2015 14:13:36 -0500 Received: by mail-pa0-f46.google.com with SMTP id wq6so46940611pac.1; Thu, 17 Dec 2015 11:13:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GLyvMrgpL2UsNrr6TA8clOGXErwucalhhFxi2aiARZE=; b=k/PKcPM7SLzklZKbYlulxT6k31412jqOcwR3JTqFrfaCQST8KJpZWet2QSpC6Z9nFP olPQwVDn1WilBRQxO+LTX00wzqg5mpWj07htq/E7tAlsCOl8RxZ3AqyBtrQJSxBF+veu hoChR3EtcFJ2FE14X2HUyHNP4laQuEGHHfC6A9uEtTq7U3jlCxwSqzDNYFoYy2EGxVT5 8BS9Cg2zDNzVh9hAxiFb7ILN57SIvHmW88ZuSOhmJuIu4pVc+QnwPPX6aP105RF8+E4D 1mCz0yDkVJooU/GLhBJYpqxZO1Yjx8NlUQVfAMGwyp5e4meVmdrykHKzewmS2Eo607sO HnWQ== X-Received: by 10.66.144.65 with SMTP id sk1mr73070663pab.126.1450379615442; Thu, 17 Dec 2015 11:13:35 -0800 (PST) Received: from localhost ([209.119.72.78]) by smtp.gmail.com with ESMTPSA id p20sm12994926pfi.25.2015.12.17.11.13.34 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Thu, 17 Dec 2015 11:13:34 -0800 (PST) From: Eduardo Valentin To: Rui Zhang Cc: Linux PM , LKML , Eduardo Valentin Subject: [PATCHv2 2/3] thermal: rework core to allow emul_temp to be treated as regular temp Date: Thu, 17 Dec 2015 11:13:28 -0800 Message-Id: <1450379609-7826-3-git-send-email-edubezval@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1450379609-7826-1-git-send-email-edubezval@gmail.com> References: <1450379609-7826-1-git-send-email-edubezval@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change the way we handle emul_temp. This is to allow emul_temp to be used as input to exercise thermal core properly. Now, even if .get_temp is not available, the emul_temp can be used to emulate temperature. Cc: Zhang Rui Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin Reviewed-by: Srinivas Pandruvada --- V1-> V2: fixed real_temp initial value. --- drivers/thermal/thermal_core.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 8fa82c0..a229c84 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -472,18 +472,25 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, int trip) int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) { int ret = -EINVAL; - int count; - int crit_temp = INT_MAX; - enum thermal_trip_type type; + int crit_temp = INT_MAX, real_temp = INT_MIN; - if (!tz || IS_ERR(tz) || !tz->ops->get_temp) - goto exit; + if (!tz || IS_ERR(tz)) + return ret; mutex_lock(&tz->lock); - ret = tz->ops->get_temp(tz, temp); + /* Allow emulation if .get_temp is still not available */ + if (tz->ops->get_temp) { + ret = tz->ops->get_temp(tz, temp); + if (!ret) + real_temp = *temp; + } if (IS_ENABLED(CONFIG_THERMAL_EMULATION) && tz->emul_temperature) { + enum thermal_trip_type type; + int count; + + ret = 0; for (count = 0; count < tz->trips; count++) { ret = tz->ops->get_trip_type(tz, count, &type); if (!ret && type == THERMAL_TRIP_CRITICAL) { @@ -498,17 +505,17 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) * is below the critical temperature so that the emulation code * cannot hide critical conditions. */ - if (!ret && *temp < crit_temp) + if (!ret && real_temp < crit_temp) *temp = tz->emul_temperature; } mutex_unlock(&tz->lock); -exit: + return ret; } EXPORT_SYMBOL_GPL(thermal_zone_get_temp); -static void update_temperature(struct thermal_zone_device *tz) +static int update_temperature(struct thermal_zone_device *tz) { int temp, ret; @@ -518,7 +525,7 @@ static void update_temperature(struct thermal_zone_device *tz) dev_warn(&tz->device, "failed to read out thermal zone (%d)\n", ret); - return; + return ret; } mutex_lock(&tz->lock); @@ -529,17 +536,17 @@ static void update_temperature(struct thermal_zone_device *tz) trace_thermal_temperature(tz); dev_dbg(&tz->device, "last_temperature=%d, current_temperature=%d\n", tz->last_temperature, tz->temperature); + + return 0; } void thermal_zone_device_update(struct thermal_zone_device *tz) { int count; - if (!tz->ops->get_temp) + if (update_temperature(tz)) return; - update_temperature(tz); - for (count = 0; count < tz->trips; count++) handle_thermal_trip(tz, count);