From patchwork Mon Sep 4 19:56:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 111605 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp1935220qge; Mon, 4 Sep 2017 12:57:48 -0700 (PDT) X-Received: by 10.99.121.135 with SMTP id u129mr1591718pgc.260.1504555068480; Mon, 04 Sep 2017 12:57:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504555068; cv=none; d=google.com; s=arc-20160816; b=hUsfvG8YJqUrTmOkFwmo+gDHtamjco8A7IDcLBB2xVU5bR8vXwjrU9gOE8wfSOxR9D 07PNdvBZ+PHSExaHad8eaT7TMsSxWTT4z0tVXz2H/cwphhVuI+YrEYL1Xq72L/WcZsqR S19NzIP9WcZyNUk4CoapBVNJhP18hoi40S3Xq678BovulJ704gi8Zw471n141HXkTMyU B9k3Que2kbOrELnjZu+0RVrofw8meUp9vuMccHgO8DhIJpSAiu6g1lWTSnoTlV92EfwW i4SiosyoEdWQEjZpwA3BbIyg1W8jREXcbI9QnTFtoyUS05vHldZag976awg6hODBogeZ b7bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=NuA6gjRftABL/rv9GKnssf5OdZWL4ib7fDKZNQooWY0=; b=kZCmNkQDmJ7AsLrTxhbS+RphGyh3ISvTg5gWXIzg8YypBRMfrdRX/s/lVRSKc0MRgp nK4QP6P2PihW0RNa3kKthPPEzke3ayJ8Z8mNAOeW/HyQtctgtwEW01dPSJwyT2SZcHg9 yiK23kN18JZb6u2YUYbmp3q3t25QZ+fwvat44L6hpEpiwyG3jPC9zgAWTneB4wcA7J+/ emEBQZ0++DfL76NBHC4OGfITIUd61cQD5Im44TocpSpbkdGZQxbVPq8Xj+RnaFG03aXK 1bECAUgnOS/2AmoHnNEbXwU/mKNFcyhTXJAIE0Aha3dLAKvpP3xgivP7vcbDs5T4hLHR egXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VvNeB+rR; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 w15si5872932plk.360.2017.09.04.12.57.48; Mon, 04 Sep 2017 12:57:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=VvNeB+rR; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1754014AbdIDT5o (ORCPT + 12 others); Mon, 4 Sep 2017 15:57:44 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:35191 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753957AbdIDT5i (ORCPT ); Mon, 4 Sep 2017 15:57:38 -0400 Received: by mail-wm0-f54.google.com with SMTP id v2so9982447wmf.0 for ; Mon, 04 Sep 2017 12:57:38 -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 :mime-version:content-transfer-encoding; bh=NuA6gjRftABL/rv9GKnssf5OdZWL4ib7fDKZNQooWY0=; b=VvNeB+rRUS8aY3K6TO+aeUVNjZhCZCxSHybDiHAH/EyhHCIErnMTrGfqpaKheXpbrJ qeR9FG/OoTtJh7brpvEjur62CQSvIufUuciop1K29TN0t0ZlxA7kUmDbb3mmN5rcn0vc LYRV2JiWKGjMszuuQlZL+5HrP7pX0xFVZwuC8= 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:mime-version:content-transfer-encoding; bh=NuA6gjRftABL/rv9GKnssf5OdZWL4ib7fDKZNQooWY0=; b=OLj3rh6M57Idajymy4vHTouU8abxoKUm205S+DdHItWKOC1AiMQs3+a2JDnYoabGel ETB7eED8c6ZSgY+4pousOLpCvenbFBUs8CNYFLXzGS/rjbbWBHOSlz0EhozxtbXBwOp4 H4d8AXArLY8B89sUNIKE4XTLvqRY+lBW9u9h1civbYvAz1Rg4/aYalXKNyKh27u0kTER oWkuNsBqy0Niq+qSn3TEKlqKLh3dktWYerhEEK24276emkc1x9ViVteTUBT7DIMVlZPy 8CrlS5H4CtLg715yBzjnyLk9S2nnTrmP2m5jK+TQLPC+nVGvSJUn/y4drlIwUcBPUJs9 TOCg== X-Gm-Message-State: AHPjjUiCIphWTzZgacrHhfeaGii0P3A50XDWg48UbhmELiw3JAyQxy2S SRHHLydmlTH5s/2l X-Google-Smtp-Source: ADKCNb7+AJu0cPgzea3lzmy096dlawOHtYWX4g00f27p9dnOqLCO3Hm637oKza71jcrlhNLHOeKqtA== X-Received: by 10.28.137.19 with SMTP id l19mr1124039wmd.98.1504555057563; Mon, 04 Sep 2017 12:57:37 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:f567:7c41:be9d:9286]) by smtp.gmail.com with ESMTPSA id 23sm10798976wrt.44.2017.09.04.12.57.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Sep 2017 12:57:37 -0700 (PDT) From: Daniel Lezcano To: rui.zhang@intel.com, edubezval@gmail.com Cc: daniel.lezcano@linaro.org, linux-pm@vger.kernel.org, kevin.wangtao@linaro.org, leo.yan@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 04/13] thermal/drivers/hisi: Simplify the temperature/step computation Date: Mon, 4 Sep 2017 21:56:03 +0200 Message-Id: <1504554972-2624-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504554972-2624-1-git-send-email-daniel.lezcano@linaro.org> References: <1504554972-2624-1-git-send-email-daniel.lezcano@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The step and the base temperature are fixed values, we can simplify the computation by converting the base temperature to milli celsius and use a pre-computed step value. That saves us a lot of mult + div for nothing at runtime. Take also the opportunity to change the function names to be consistent with the rest of the code. Signed-off-by: Daniel Lezcano Reviewed-by: Leo Yan Tested-by: Leo Yan --- drivers/thermal/hisi_thermal.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index f69aea0..583bc19 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -35,8 +35,9 @@ #define TEMP0_RST_MSK (0x1C) #define TEMP0_VALUE (0x28) -#define HISI_TEMP_BASE (-60) +#define HISI_TEMP_BASE (-60000) #define HISI_TEMP_RESET (100000) +#define HISI_TEMP_STEP (784) #define HISI_MAX_SENSORS 4 #define HISI_DEFAULT_SENSOR 2 @@ -61,19 +62,32 @@ struct hisi_thermal_data { void __iomem *regs; }; -/* in millicelsius */ -static inline int _step_to_temp(int step) +/* + * The temperature computation on the tsensor is as follow: + * Unit: millidegree Celsius + * Step: 255/200 (0.7843) + * Temperature base: -60°C + * + * The register is programmed in temperature steps, every step is 784 + * millidegree and begins at -60 000 m°C + * + * The temperature from the steps: + * + * Temp = TempBase + (steps x 784) + * + * and the steps from the temperature: + * + * steps = (Temp - TempBase) / 784 + * + */ +static inline int hisi_thermal_step_to_temp(int step) { - /* - * Every step equals (1 * 200) / 255 celsius, and finally - * need convert to millicelsius. - */ - return (HISI_TEMP_BASE * 1000 + (step * 200000 / 255)); + return HISI_TEMP_BASE + (step * HISI_TEMP_STEP); } -static inline long _temp_to_step(long temp) +static inline long hisi_thermal_temp_to_step(long temp) { - return ((temp - HISI_TEMP_BASE * 1000) * 255) / 200000; + return (temp - HISI_TEMP_BASE) / HISI_TEMP_STEP; } static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data, @@ -99,7 +113,7 @@ static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data, usleep_range(3000, 5000); val = readl(data->regs + TEMP0_VALUE); - val = _step_to_temp(val); + val = hisi_thermal_step_to_temp(val); mutex_unlock(&data->thermal_lock); @@ -126,10 +140,11 @@ static void hisi_thermal_enable_bind_irq_sensor writel((sensor->id << 12), data->regs + TEMP0_CFG); /* enable for interrupt */ - writel(_temp_to_step(sensor->thres_temp) | 0x0FFFFFF00, + writel(hisi_thermal_temp_to_step(sensor->thres_temp) | 0x0FFFFFF00, data->regs + TEMP0_TH); - writel(_temp_to_step(HISI_TEMP_RESET), data->regs + TEMP0_RST_TH); + writel(hisi_thermal_temp_to_step(HISI_TEMP_RESET), + data->regs + TEMP0_RST_TH); /* enable module */ writel(0x1, data->regs + TEMP0_RST_MSK);