From patchwork Tue Mar 24 05:21:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 6077251 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 2F5909F350 for ; Tue, 24 Mar 2015 05:23:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 57D3E201FA for ; Tue, 24 Mar 2015 05:23:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFB0E20270 for ; Tue, 24 Mar 2015 05:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753121AbbCXFXn (ORCPT ); Tue, 24 Mar 2015 01:23:43 -0400 Received: from mga14.intel.com ([192.55.52.115]:64496 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752994AbbCXFXm (ORCPT ); Tue, 24 Mar 2015 01:23:42 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 23 Mar 2015 22:23:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,456,1422950400"; d="scan'208";a="669624434" Received: from aaronlu.sh.intel.com ([10.239.159.58]) by orsmga001.jf.intel.com with ESMTP; 23 Mar 2015 22:23:43 -0700 From: Zhang Rui To: linux-pm@vger.kernel.org Cc: Zhang Rui , Subject: [PATCH 3/3] Thermal: do thermal zone update after a cooling device registered Date: Tue, 24 Mar 2015 13:21:30 +0800 Message-Id: <1427174490-7974-4-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427174490-7974-1-git-send-email-rui.zhang@intel.com> References: <1427174490-7974-1-git-send-email-rui.zhang@intel.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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 When a new cooling device is registered, we need to update the thermal zone to set the new registered cooling device to a proper state. This fixes a problem that the system is cool, while the fan devices are left running on full speed after boot, if fan device is registered after thermal zone device. CC: #3.18+ Reference:https://bugzilla.kernel.org/show_bug.cgi?id=92431 Tested-by: Manuel Krause Tested-by: szegad Tested-by: prash Tested-by: amish Signed-off-by: Zhang Rui --- drivers/thermal/thermal_core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 9c03561..7cef579 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1141,6 +1141,7 @@ __thermal_cooling_device_register(struct device_node *np, const struct thermal_cooling_device_ops *ops) { struct thermal_cooling_device *cdev; + struct thermal_instance *pos, *next; int result; if (type && strlen(type) >= THERMAL_NAME_LENGTH) @@ -1185,6 +1186,15 @@ __thermal_cooling_device_register(struct device_node *np, /* Update binding information for 'this' new cdev */ bind_cdev(cdev); + list_for_each_entry_safe(pos, next, &cdev->thermal_instances, cdev_node) { + if (next->cdev_node.next == &cdev->thermal_instances) { + thermal_zone_device_update(next->tz); + break; + } + if (pos->tz != next->tz) + thermal_zone_device_update(pos->tz); + } + return cdev; }