From patchwork Tue Oct 10 18:02:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 115447 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4048021qgn; Tue, 10 Oct 2017 11:14:11 -0700 (PDT) X-Received: by 10.98.19.24 with SMTP id b24mr14495216pfj.168.1507659251463; Tue, 10 Oct 2017 11:14:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507659251; cv=none; d=google.com; s=arc-20160816; b=EpRvB/bN7/yhGFExKxuK7lPZwDpXexgBwqJzaz/cdOAw/F0teTTe6rmzV6wOI02OEZ mEoshMKv1WxRakYN3RAp1PdJoKyWSPg0dGLMPLrGDwe0iJAfQS9uge1CrVEWeNcr7WqB qM7Z4lMwVXrNdSG8KAsG3DM9ryfOpPhlsHfRARz4dBg7aKb4nxZhW60o04qrlPW3RJjq RzkiX9T8RqGioZO7H8dwE2EbiAkLW47jVDMGZR5PP1e/QOxGc6v/QSX2SQ9CuVxKcBVG aAefMKLMQsbhZnxUPAJIVdpSyPe0BbnZl1l3YHVbda+cFJhPLxkbOv8T7ERPOD7h37Lb n57A== 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=EYuadkShQdCiMrX8H0Tm3wmurc4mV8xR4jVW+FYgK4Q=; b=ir2eK0BfhRES95xJEdS++GAyj7K4gKbDyfk49RNfZJrrl9r39Xz1IFazsbu/grQOL7 tT7/siMN2Pa/acdeRl/+G91s9LEUqN2++WhRy6ECW7LdSItO8yERes65QG0h5h2lj9/M 6kuhtnA3ULOxGhDVbHLGoNFMRTYTr9TI0orTS1hqAVtjXwN+rSuJpNxnDBnceyXfJWp4 WyKYT3EFDLjEpeTSh6iQ+ArRzIvmXufAl2ib4Esm9iljM3zILET5zAtV95Ymvu+J+u6k HNKqTtAMDYD7CHacOJfJhCKmgRfQwfl/LlaFky92HtK8LlDCnJIFgDmfBIBi74NhbWTG x4hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OZHlBROM; 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 67si9568645pfy.188.2017.10.10.11.14.11; Tue, 10 Oct 2017 11:14:11 -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=OZHlBROM; 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 S932748AbdJJSOH (ORCPT + 26 others); Tue, 10 Oct 2017 14:14:07 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:46312 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756327AbdJJSEy (ORCPT ); Tue, 10 Oct 2017 14:04:54 -0400 Received: by mail-wm0-f49.google.com with SMTP id m72so7517260wmc.1 for ; Tue, 10 Oct 2017 11:04:54 -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=EYuadkShQdCiMrX8H0Tm3wmurc4mV8xR4jVW+FYgK4Q=; b=OZHlBROMm0Sju2ivdHQ/wyPJ0ZKXnbGdfwAm0vK64fltKbOxmGkrCb/eV0t7iLb05n 7i5M7QxurZngL2hXthRxcWcvyepvAe2n6v1W/YHga0Y4kjTb3Q4y6ku6sVPeGi5M1iy1 Lkb4L2kMKWLQ61mciDJCkW07Pi8TPwPhhb9QQ= 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=EYuadkShQdCiMrX8H0Tm3wmurc4mV8xR4jVW+FYgK4Q=; b=uS99Nloc/Fs4gRHn+XIQ6vpVF1JRovF1F7JgCyCdPPfc75DKWX4vnO3mKFC7OY92G3 ZQoJdNmveqxb4J2Fz3d4NInLi+Jwd5ui4jPd8BnFT1j0FVNjdU68mCvBPaynSGfaBt4P 7O7cIIBOwNopZtQDc+qYV5CKm0X0DI4oakYwBRnsWZpk05kB+unccCJpxzdoyEi+p/I4 /po7J+IYzxLgS+WMckuBGXwQ+ZVR69iIfX7eeM5+8v4eJNaY4NjUR2ojT6/QFn3lW/n9 2Hz4RYVZFP+6t72brvUD+X+aR1MZH47tvQqdR+w1VINqKkpa3VEdKvNRF3v4WpSZWtEw fPvQ== X-Gm-Message-State: AMCzsaVsrc/YKCWdPynd+ER1Lrt1GFNLS0bsi68ji94SxKBGqhpfoG9B zgLUobyiIwOAzREUu47iWHwuQw== X-Google-Smtp-Source: AOwi7QAwcVhMkul0Otsbi4IN/QUwTDgxuHZJypzeMT4RT1FcweiMLZZczFeNb3IRyMTVrd23CUeaqw== X-Received: by 10.28.51.19 with SMTP id z19mr10766330wmz.18.1507658693204; Tue, 10 Oct 2017 11:04:53 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:4f9:3ae1:43d2:31ae]) by smtp.gmail.com with ESMTPSA id l73sm12513428wmd.47.2017.10.10.11.04.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Oct 2017 11:04:52 -0700 (PDT) From: Daniel Lezcano To: edubezval@gmail.com, rui.zhang@intel.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, kevin.wangtao@linaro.org, Leo Yan Subject: [PATCH 04/25] thermal/drivers/hisi: Simplify the temperature/step computation Date: Tue, 10 Oct 2017 20:02:29 +0200 Message-Id: <1507658570-32675-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507658570-32675-1-git-send-email-daniel.lezcano@linaro.org> References: <79a5f10c-0fb7-3e4f-caac-c1625904b137@linaro.org> <1507658570-32675-1-git-send-email-daniel.lezcano@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 feae552..04eb5e2 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);