From patchwork Wed Aug 30 08:47:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 111283 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp595170qge; Wed, 30 Aug 2017 01:49:01 -0700 (PDT) X-Received: by 10.99.167.77 with SMTP id w13mr813133pgo.448.1504082941309; Wed, 30 Aug 2017 01:49:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504082941; cv=none; d=google.com; s=arc-20160816; b=DVE1NRM0T+1OzZDGEje3GmOBp33/F5UOxPoVB6BDL9O0XYzWV9vOefZts9+iK4v7xc lpyx7kCZxrg1O2XbSViIDucs8CQ2+AglLDwr76Q/0L5tTUNAUb+UI6GgnbZ+Bvy57Ws2 ROetCZRXUaspAOyJTilM0zF/rv0VTbHoKvy8dhwJq9DEDzivN9QWmkwqpxRVAYohBqoX SOIAKOyuEIRQjOy/rPXu6m5FnnKKncLtJe7nj9XMwHjImyC58zuTajksNZfDSZ7+rOW+ OhP4oqdZcDCERlGLfNN+XMU1gqdQ1XtX+8zgu2+mwPsYgk/4ESg2mwIRcpjZ2uNtQDB9 e56w== 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=4HbvK6BUvYUgvRAgNOEcC64tIt4D3NKLKxpXvAOgmPg=; b=Rs1Yw5ihWzuKDzZDBYJKhYJtk9InLwYzus2NcWpdgjm5PmExanuFbP0b5b56pdsQEj 3iQCMPS7/bWUJIIUYNtQQ75qb1Oj8MrKCyj3O7SsDYC52b/Z3R8TwvADCxFtZNPcvpvA kWpd7v2aniUej6Dwuur4nNUacud5YzQlXTVCouRqVA5MfCaHSqtz2kzwylFBOx3VhdFv +ooqj9950kBlGuaEg+lEzcrg1XLp6DBrvG78qLWEMlL0Tp0a2750LxaypIu0j28+flxY qySP9nMbhF6ngxKXsC9c2iF/XkO/qm6xdZmbj7ilHbznI35+7ahCNJTRa7UMX7qXCuXY qNQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xe4KQp+N; 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 i7si3903435pgt.598.2017.08.30.01.49.01; Wed, 30 Aug 2017 01:49:01 -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=Xe4KQp+N; 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 S1751586AbdH3Is5 (ORCPT + 26 others); Wed, 30 Aug 2017 04:48:57 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:38079 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751408AbdH3Isu (ORCPT ); Wed, 30 Aug 2017 04:48:50 -0400 Received: by mail-wm0-f48.google.com with SMTP id t201so6047932wmt.1 for ; Wed, 30 Aug 2017 01:48:49 -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=4HbvK6BUvYUgvRAgNOEcC64tIt4D3NKLKxpXvAOgmPg=; b=Xe4KQp+NJsz+R2ITTLiPY482Z9gi8djDg9d0nlELo18D69DTTJdAU+pcBrr2O9QEH8 y4WtHzoGbQXzSgGI9RenD1NVKkBo6buEeXoLt7HJpscsv14CvcW0/dHgWV1F0gXAlMPt cTPa1ZABohT/EojvMmlT+fuBcaKCictjv3u/A= 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=4HbvK6BUvYUgvRAgNOEcC64tIt4D3NKLKxpXvAOgmPg=; b=lyr1lbwRYfU/zyO52EbT2t7GIcRuD117SEsD7a22Uecf3UlrnrVGNrx6XCKz4gx+9V 56eOS+OKscBInXYJewAXZonKpDh8xkF77+8z8qsB3gFVrIvSD8SvaeWP/kGfuhofLDek Yu5/UC3xllpcEkK9M7PwXu6uQ+JQKSWvy1PBpcDRBcsfdlwAtgAGf3pUikgp/ZHbGM8a tlLBphybg21cDvUunhua/vpZJU5vg9vVG32my1TXu0Z+M9Ikrp9BL3+RhEEdYrfabsz9 LEWaygVxtPWtt1Dqf0oCNZ73Qlu9rG4pJeICkG379by+J2xQFlSArMyFocUFMGvrL/1G LW3Q== X-Gm-Message-State: AHYfb5gKf4qsU/CQsFI9fvMrQkn2+ReKK8DBIDrMUvvuWGO04UrYT8p2 vC7ctwfAn+8OwbkShiaMeg== X-Received: by 10.28.134.133 with SMTP id i127mr800148wmd.162.1504082929113; Wed, 30 Aug 2017 01:48:49 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:b0b0:ba2b:b9fd:8a33]) by smtp.gmail.com with ESMTPSA id q24sm4032811wrc.26.2017.08.30.01.48.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Aug 2017 01:48:48 -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 (open list) Subject: [PATCH 04/13] thermal/drivers/hisi: Simplify the temperature/step computation Date: Wed, 30 Aug 2017 10:47:28 +0200 Message-Id: <1504082857-21702-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504082857-21702-1-git-send-email-daniel.lezcano@linaro.org> References: <1504082857-21702-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 --- drivers/thermal/hisi_thermal.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) -- 2.7.4 Reviewed-by: Leo Yan Tested-by: Leo Yan diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 67db523..b58ad40 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);