From patchwork Thu Jul 26 10:33:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 142958 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp288842ljj; Thu, 26 Jul 2018 03:33:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe4QAoC1hcGnCZIiHAxqhRr/dRlxS2izMcSNwyf8TMVtifmUsIcnCXjY1ZFUUKW6Sw+9Y6p X-Received: by 2002:a63:de10:: with SMTP id f16-v6mr1362750pgg.97.1532601236133; Thu, 26 Jul 2018 03:33:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532601236; cv=none; d=google.com; s=arc-20160816; b=iBK/RsFyyr5MyrH5sHlAIdrx0GfGs8RrR+p35i3B3gs93Z+XOKN1IC4VyKAl1H5dFI fFc5GfYI5HUCuxabqOFPgWk/f9ZNsmfSwr72K0gXov4a8cyo2F+TYOH/VOQaLBxPaDvD ygEKp5VykZig03BJFP5yWeoCg4NYNP1PVhqVPPRjCU0/2S7XrDZeorxcB5lxS25VGnR7 eVIWSckhXY9GmIYV7CxzmAVoD+jZ2D+tCuesPpMeY6GS42BJEIo95LTvMah3RhUlTHnl jLQuRSJHjOArnqt2l0N2zSbfPfY/e4edEqKEWUpjgK+hBsztb9ahTPzoWwNJw5yL8hc7 fjUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=LnuO8mINuH/6zEhwieXU1MyQ1uhrZQBRKE+R5lMhY9U=; b=xduc9OBxES7A7PVLsBDFhfQwycxu8GSSkZ5xORKX9/crYU1oU2+tnnX1Z//r0B0mgl C+13069MysURR2QnIsfhW3pZv/ozaJhSpqchbnk0xSKipQ2cMTXN6fmT7pmLQj/H4vJS t8kvG/omOf6lb37H6mk0bmMaWeKabPfy+fBsmqA5kLVEO7WUeFa9GV2OTGpaZieJTbIn mVMHp4YLgB7pdIxULL1cNkmHBjWmgZFymOPRSrRls3a59LUokw+x1mhP8f9MpuHsxCoa j2iw/Rx3tBckt9qvdCnVacKVygA5Q0CkDQef+lVCjRBq3J3iMvy9u6P/ecUWBGyFqtWt K7Hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JHfy94uO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h25-v6si1019681pgh.119.2018.07.26.03.33.55; Thu, 26 Jul 2018 03:33:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JHfy94uO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729510AbeGZLuG (ORCPT + 31 others); Thu, 26 Jul 2018 07:50:06 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:56147 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729450AbeGZLuF (ORCPT ); Thu, 26 Jul 2018 07:50:05 -0400 Received: by mail-wm0-f67.google.com with SMTP id f21-v6so1449895wmc.5 for ; Thu, 26 Jul 2018 03:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=LnuO8mINuH/6zEhwieXU1MyQ1uhrZQBRKE+R5lMhY9U=; b=JHfy94uO0KUBlye3Ri4yZvHQKKeISc0CUzRbZtwLlgsPJ8Gt1oItxh7O0vvX/q5ZAz w9peiRZXhYQ5G3OY/LXCJ+3Cdu5XFGeltKLjqkGemvBU6WQKIXahhcM1WefrHclDiU9e e4wZBgkr6uxqW8nxQM5F86ZPCJbeMxytR8JlM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=LnuO8mINuH/6zEhwieXU1MyQ1uhrZQBRKE+R5lMhY9U=; b=kFiFtnVhtNAXcYRwCsnmEdl6w3cO/vvg5Xhpc3BulmbjKSFrTP8ZQqQ4y90M2Q7KwT YKb7FWu/pFJJX9bBDMBl11D7b9nsVFq9ZZ36Qoj9H1MMsERoISNM6dkHp4yhRKvkZH9f Z0A0ehatJH7QHV7QlOjDoOmLKfFzEE1dFduv/Z4349UXRwBtm5F26DY3WJCgwdF+mZtr 1hnP3ExoW/TuvZwYL+1vF99tIgRaCugK2AkF2dfoPKit4BhgT0/dUugMq86Xe6knLQQc ++oRpHbWDedly+hiOIqk25GO1qAVGeN/4Fy/g3lm4W0DrfF3/9hur5IfzNeJyhkm0Y6B 1H/w== X-Gm-Message-State: AOUpUlE3T6vp4cvvu5aGUMMfKHevj+7Jxh7e9qG1EWsvbZrI5gisgjkS z6STaagzXMgeMzPBC4eh22vuqY+ksuo= X-Received: by 2002:a1c:7d47:: with SMTP id y68-v6mr1149937wmc.62.1532601230918; Thu, 26 Jul 2018 03:33:50 -0700 (PDT) Received: from localhost ([49.248.197.57]) by smtp.gmail.com with ESMTPSA id i125-v6sm2357906wmd.23.2018.07.26.03.33.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jul 2018 03:33:50 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org Cc: rnayak@codeaurora.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, smohanad@codeaurora.org, andy.gross@linaro.org, dianders@chromium.org, mka@chromium.org, Zhang Rui , linux-pm@vger.kernel.org Subject: [PATCH v2 3/3] thermal: tsens: Fix negative temperature reporting Date: Thu, 26 Jul 2018 16:03:10 +0530 Message-Id: <52516c287c9455676e7cbde4a4fa94282d73367f.1532600791.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.GIT In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current code will always return 0xffffffff in case of negative temperatures due to a bug in how the binary sign extension is being done. Use sign_extend32() instead. Signed-off-by: Amit Kucheria Reviewed-by: Matthias Kaehlcke --- drivers/thermal/qcom/tsens-v2.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -- 2.17.GIT Reviewed-by: Bjorn Andersson diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index 908e3dcb2d5c..44da02f594ac 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -5,19 +5,20 @@ */ #include +#include #include "tsens.h" #define STATUS_OFFSET 0xa0 #define LAST_TEMP_MASK 0xfff #define STATUS_VALID_BIT BIT(21) -#define CODE_SIGN_BIT BIT(11) static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) { struct tsens_sensor *s = &tmdev->sensor[id]; u32 code; unsigned int status_reg; - int last_temp = 0, last_temp2 = 0, last_temp3 = 0, ret; + u32 last_temp = 0, last_temp2 = 0, last_temp3 = 0; + int ret; status_reg = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * 4; ret = regmap_read(tmdev->map, status_reg, &code); @@ -54,12 +55,8 @@ static int get_temp_tsens_v2(struct tsens_device *tmdev, int id, int *temp) else if (last_temp2 == last_temp3) last_temp = last_temp3; done: - /* Code sign bit is the sign extension for a negative value */ - if (last_temp & CODE_SIGN_BIT) - last_temp |= ~CODE_SIGN_BIT; - - /* Temperatures are in deciCelicius */ - *temp = last_temp * 100; + /* Convert temperature from deciCelsius to milliCelsius */ + *temp = sign_extend32(last_temp, fls(LAST_TEMP_MASK) - 1) * 100; return 0; }