From patchwork Thu Feb 26 06:01:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 5887411 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0F353BF440 for ; Thu, 26 Feb 2015 06:01:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C6192037F for ; Thu, 26 Feb 2015 06:01:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F35C820374 for ; Thu, 26 Feb 2015 06:01:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750938AbbBZGBw (ORCPT ); Thu, 26 Feb 2015 01:01:52 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:41396 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750768AbbBZGBw (ORCPT ); Thu, 26 Feb 2015 01:01:52 -0500 Received: by padfb1 with SMTP id fb1so11332805pad.8 for ; Wed, 25 Feb 2015 22:01:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5Bkyr8sTu625TyHff2OgzC/FwA2Ytt+c/0ZSc9W0BgY=; b=YVq9RvJTUAQqW0JlFkw6ELWHFTiDczggOTUtV9Kxtiz8YqoWYLNcPNrHL8Bme0NjOH KIluwXghcIvbv6RJj5p1JSHPO3MtlbbkvIMesHqvZ7CA9ASFBJ1omdLqsHkZer13gQeB GxSej7SWImbpXuaUwcr5EX4rNzqgcv/grtLqiHLBiT8agZAfTEQI6mQdVBw5XcJ68ZEe W+MR3eIvTgI+m38XgP4Sn4JPCL991LzBC8ebmIGGe2ZpiEkybcB4WQvDhwNtRpw+wvLl qp9kYlycffM5iXmhQt9R3hieK9UztnoTWWsFS0uExCLRwshB/NWVk0tgV9MCPIbcvEW4 Mfsg== X-Gm-Message-State: ALoCoQnCFBMDupcFjIUP9iap3m18zqazY7/vJmJMrKYDlLqDMX312/HxyrkgMgfHaXyBhaG+o3uT X-Received: by 10.70.94.195 with SMTP id de3mr11727445pdb.59.1424930511748; Wed, 25 Feb 2015 22:01:51 -0800 (PST) Received: from localhost.localdomain ([180.150.157.4]) by mx.google.com with ESMTPSA id jj1sm43288747pac.17.2015.02.25.22.01.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Feb 2015 22:01:51 -0800 (PST) From: Leo Yan To: Zhang Rui , Eduardo Valentin , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan Subject: [PATCH] thermal: fix the casting issue for long type Date: Thu, 26 Feb 2015 14:01:32 +0800 Message-Id: <1424930492-22658-1-git-send-email-leo.yan@linaro.org> X-Mailer: git-send-email 1.9.1 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=ham 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 enable the thermal on arm64 platform, it will report failure when call function *thermal_zone_bind_cooling_device()*. The failure is caused by casting. If dtb specify the minimum cooling state and maximum cooling state as THERMAL_NO_LIMIT, then variables "lower" and "upper" equal to 0x0000_0000_ffff_fffff after casting the value from "unsigned int" to "unsigned long". Finally in kernel if check the variables "lower" and "upper", it will never equal to (-1UL), or 0xffff_ffff_ffff_fffff. So change to use "unsigned int" type, this can be compatible for 32 bits and 64 bits system. Signed-off-by: Leo Yan --- drivers/thermal/of-thermal.c | 4 ++-- drivers/thermal/thermal_core.c | 6 +++--- include/linux/thermal.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index 668fb1b..b50c4e1 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -49,8 +49,8 @@ struct __thermal_bind_params { struct device_node *cooling_device; unsigned int trip_id; unsigned int usage; - unsigned long min; - unsigned long max; + unsigned int min; + unsigned int max; }; /** diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 48491d1..04de575 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -923,7 +923,7 @@ thermal_cooling_device_trip_point_show(struct device *dev, int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, int trip, struct thermal_cooling_device *cdev, - unsigned long upper, unsigned long lower) + unsigned int upper, unsigned int lower) { struct thermal_instance *dev; struct thermal_instance *pos; @@ -952,8 +952,8 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, return ret; /* lower default 0, upper default max_state */ - lower = lower == THERMAL_NO_LIMIT ? 0 : lower; - upper = upper == THERMAL_NO_LIMIT ? max_state : upper; + lower = lower == (unsigned int)THERMAL_NO_LIMIT ? 0 : lower; + upper = upper == (unsigned int)THERMAL_NO_LIMIT ? max_state : upper; if (lower > upper || upper > max_state) return -EINVAL; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index fc52e30..a2afe04 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -321,7 +321,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *); int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, struct thermal_cooling_device *, - unsigned long, unsigned long); + unsigned int, unsigned int); int thermal_zone_unbind_cooling_device(struct thermal_zone_device *, int, struct thermal_cooling_device *); void thermal_zone_device_update(struct thermal_zone_device *);