From patchwork Thu Oct 19 17:05:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 116432 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp726872qgn; Thu, 19 Oct 2017 10:13:55 -0700 (PDT) X-Received: by 10.84.241.207 with SMTP id t15mr2017610plm.158.1508433235003; Thu, 19 Oct 2017 10:13:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508433234; cv=none; d=google.com; s=arc-20160816; b=KxBO8+MWincI0No5MsEU5I8yxJtTL949c4lFJNgThRB7/Tg6ClkrsJVKZX9/dvfG+3 9AhMJkhaHqWlg9/Xow8SPgATMY0tzLckhS4CepWJPA8w8eMOX9GQsyP9QkW1MhopM4hz v3v7e9Y/LZoGspfIqmlZYbUqZHU/7wQoqxL4iCtbtb9Sj5GSR3lpChp6KXpfSJFpgCkV A1brF15EYXWYbqBjx/ZdQM9tHKV/1WjZb7HuaMcYlCdgTcPDZO4unxyzP/sG5GeFo5+p 92VeboqUgOG33oKLzDHFjRwUW9LcKuDIYKCDwxRfZtRyBEZvD77Bpyxu7fZ68aSxkfgv wKTA== 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=d2C8D8wdyZNQ+pUZxtLZYTPiq7qnCrViCQ9JHyJrA2yo9/dpI4n2f9GtmL0dRtgE1C Ny6HlWBf4bMG2gmrpzRE8R3cHSh0NH6wo4jECB9SXtaCMrQSYHW/S42l6hbYlboEWdYk iIA3Wu+FBgdNqfCUzM0xl2MCpasilHTQCUYNMe7LJd3h1y0lfWD2oZDtvr5Cd0ZUfanI MuCXSkvwuECA2usJ0u+qfQ4STwm6M5V7E9szV9uAnLgNt+XyjT+VHyaJQmV+C5V2y8Bg nBB/3OJJkA5C7YwMdYzVlxTQv5VI0BHxcsrtopX3YJ55y1aSJ62YScnenPNDeEUL0zxk 5aUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HabCQJOq; 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 39si5018553plc.68.2017.10.19.10.13.54; Thu, 19 Oct 2017 10:13:54 -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=HabCQJOq; 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 S1752328AbdJSRNw (ORCPT + 27 others); Thu, 19 Oct 2017 13:13:52 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:56779 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755013AbdJSRIg (ORCPT ); Thu, 19 Oct 2017 13:08:36 -0400 Received: by mail-wm0-f65.google.com with SMTP id l68so17713425wmd.5 for ; Thu, 19 Oct 2017 10:08:35 -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=HabCQJOqTh8plwrw25WWu4VRdMr5P8zZL/UPKSl3F+fvAL+dXZ7P4+zPcWEhFTKh+j nb7qVhn0NcMycoU+vWcB8YgzxkphonhvkaV+H1knFiBdMsxoAYSGdhCzfGZCw2zSu7Fr SkbVxomhCUDf9rWeh4l9il618nuGAETIyFfdY= 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=IOF3Y8l3UBSn5p6qY5XwsJtyR0z8g0N8oIzUp5mjmTOgteSBQBffYs0Lb8HGbRWx3i s4L0H1pDDRmPdiHDU20tUYizuCuU3ILYa9XQQNRrVhX9SaVkQlyaEgHrahjqczgExIXM yBcglCf/IKp3VX+MfTJTXEBqJsvqbbkvx55kFK1ftHbbj+3jFhTco9+rsmSl82vbycCI A/NLXp87gN6G4cqMW8dY8mS19qt/3dFP4ujSJOlNIO9BJ9Vi1KVjElAWiCCAj4ZSV/ng Y5L8b21iy6Hv1LYhTUlcEiLE7b3/FaFxoJ6/XNFZrVfF1/Sl3THTf0pXxmTObSgE9QGi yg0w== X-Gm-Message-State: AMCzsaVSrGVmuwMEVAcjIHuv4JpvWVK9UJXc367e3Q31pMbZBXWXRHY2 KHskW0URyNJBIgWR28xp+WGqS6geMn4= X-Google-Smtp-Source: ABhQp+QuuHVXSegM5wdaiLONsNqy6oWU+O5V5o2l5+Kjwdj4b2E3c8Lv4cnhYvyHmNg0R9CJzdI79g== X-Received: by 10.28.55.2 with SMTP id e2mr2430377wma.60.1508432914824; Thu, 19 Oct 2017 10:08:34 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:51c7:d9b7:e14b:6840]) by smtp.gmail.com with ESMTPSA id g16sm14277394wrd.72.2017.10.19.10.08.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Oct 2017 10:08:33 -0700 (PDT) From: Daniel Lezcano To: edubezval@gmail.com, rui.zhang@intel.com Cc: linux-pm@vger.kernel.org, leo.yan@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/18] thermal/drivers/hisi: Simplify the temperature/step computation Date: Thu, 19 Oct 2017 19:05:46 +0200 Message-Id: <1508432760-17847-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508432760-17847-1-git-send-email-daniel.lezcano@linaro.org> References: <6ac48f08-7fe6-92e9-0801-6ed3bcd05ff1@linaro.org> <1508432760-17847-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);