From patchwork Wed Apr 12 09:12:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J, KEERTHY" X-Patchwork-Id: 9676901 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9376560383 for ; Wed, 12 Apr 2017 09:13:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 842DA28553 for ; Wed, 12 Apr 2017 09:13:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 781FF2858A; Wed, 12 Apr 2017 09:13:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5220328553 for ; Wed, 12 Apr 2017 09:13:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753448AbdDLJNk (ORCPT ); Wed, 12 Apr 2017 05:13:40 -0400 Received: from fllnx210.ext.ti.com ([198.47.19.17]:34844 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752805AbdDLJNj (ORCPT ); Wed, 12 Apr 2017 05:13:39 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id v3C9Dabu009010; Wed, 12 Apr 2017 04:13:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1491988416; bh=Zs2ehajyCnf4tOb9IbjIM0gwj8PyhywtW5SXzi79Tnw=; h=From:To:CC:Subject:Date; b=F1eykg4B5VHna+PnX/IM4zIb2Ld4iKdhi5mRDJKQ2oLZdj+/9dKe9VfICftleUmXV YgxIWClnDkKbq8su0tyWVSmegBYwkTvZJT5yiZe+yEW/N/5UjrumVW1aKEqeLSLKnb IzTo3+WOTBVE3SoHJpsySETyxMs4eSYFKwDmG6sk= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v3C9Dam6021106; Wed, 12 Apr 2017 04:13:36 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Wed, 12 Apr 2017 04:13:35 -0500 Received: from ula0393675.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v3C9DWau007411; Wed, 12 Apr 2017 04:13:33 -0500 From: Keerthy To: , CC: , , , , , Subject: [PATCH] thermal: core: Allow orderly_poweroff to be called only once Date: Wed, 12 Apr 2017 14:42:12 +0530 Message-ID: <1491988332-13398-1-git-send-email-j-keerthy@ti.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP thermal_zone_device_check --> thermal_zone_device_update --> handle_thermal_trip --> handle_critical_trips --> orderly_poweroff The above sequence happens every 250/500 mS based on the configuration. The orderly_poweroff function is getting called every 250/500 mS. With a full fledged file system it takes at least 5-10 Seconds to power off gracefully. In that period due to the thermal_zone_device_check triggering periodically the thermal work queues bombard with orderly_poweroff calls multiple times eventually leading to failures in gracefully powering off the system. Make sure that orderly_poweroff is called only once. Fixes: 0c01ebbfd3caf1d ("Thermal: Remove throttling logic out of thermal_sys.c") Reported-by: Nishanth Menon Signed-off-by: Keerthy --- drivers/thermal/thermal_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 11f0675..4e68ce0 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -326,6 +326,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz, int trip, enum thermal_trip_type trip_type) { int trip_temp; + static bool power_off_triggered; tz->ops->get_trip_temp(tz, trip, &trip_temp); @@ -338,11 +339,12 @@ static void handle_critical_trips(struct thermal_zone_device *tz, if (tz->ops->notify) tz->ops->notify(tz, trip, trip_type); - if (trip_type == THERMAL_TRIP_CRITICAL) { + if (trip_type == THERMAL_TRIP_CRITICAL && !power_off_triggered) { dev_emerg(&tz->device, "critical temperature reached(%d C),shutting down\n", tz->temperature / 1000); orderly_poweroff(true); + power_off_triggered = true; } }