From patchwork Thu Oct 19 17:05:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 10017847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4850F602C8 for ; Thu, 19 Oct 2017 17:10:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3349228CF0 for ; Thu, 19 Oct 2017 17:10:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27E4728D55; Thu, 19 Oct 2017 17:10:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D21D328CF0 for ; Thu, 19 Oct 2017 17:10:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982AbdJSRKW (ORCPT ); Thu, 19 Oct 2017 13:10:22 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:57321 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755115AbdJSRIw (ORCPT ); Thu, 19 Oct 2017 13:08:52 -0400 Received: by mail-wr0-f196.google.com with SMTP id r79so9047583wrb.13 for ; Thu, 19 Oct 2017 10:08: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 :mime-version:content-transfer-encoding; bh=GXkHr9S270dLkhuUiQbappPpev4Lnh5qNTan11darjg=; b=Ia654xICXE8HzrLX1/kp6jzYSQr2IpLOwwKziBGuqftSx5GFpY5Ip9aB2z4shxUhPa U8ll8AFx8x0HjC9Ff4V2UvgbzYIF6tr1qrF4xkrmWbJiITvjoi6RQTGVW2JfsSUVHg6x C0ay8/ZWeK3DJBDAEyL9DRg2JuAEJXX98Byuk= 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=GXkHr9S270dLkhuUiQbappPpev4Lnh5qNTan11darjg=; b=n40uFISzwQPhgbuPfZN5nhn8w+JDgbJje1aUlx6Z8IDlGIfd02UnzIEPsWfio46ZdZ fVO9aTMbxSFB8nTD8Gd7No9VZbGMqnd3D8p2/tvj/kBy6f+wn2yT9fAvgwM6BueDbc/h ted3eWVlAH2bItLHXQMC9wUv9NpesalxGnaL97B/nF5vB60QnoCOq/QhmIdCrHDfCcIP 8vsiaUXffeeipOo799BtAlK0CxFmIQ6eSL66eKGaSv0b8JbQt3Mwh1sc5C3Y/ocilKHL P/qLAF+Do7LQMLjtc+ku7qR98PZtWzjtCFJD+BoGN3SGCg9E6o78QmLQ7/qjDoVu2atM gnZQ== X-Gm-Message-State: AMCzsaWxws34H81SKYhhji9zRp1DVWifsBzGtXD/KiLELIJZqk3UMiZ9 cg9ft4wiuagZ/SQJEPc2eaYv5A== X-Google-Smtp-Source: ABhQp+RuUsknBGGYmcCrhUleBaFE0r8uRCXP65bO8tnd/Da4z0pDxlIXiKSCKmynLryt84MMEZQzkA== X-Received: by 10.223.185.78 with SMTP id b14mr2271703wrg.197.1508432930916; Thu, 19 Oct 2017 10:08:50 -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.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Oct 2017 10:08:50 -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, Kevin Wangtao Subject: [PATCH 15/18] thermal/drivers/hisi: Use round up step value Date: Thu, 19 Oct 2017 19:05:57 +0200 Message-Id: <1508432760-17847-15-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-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kevin Wangtao Use round up division to ensure the programmed value of threshold and the lag are not less than what we set, and in order to keep the accuracy while using round up division, the step value should be a rounded up value. There is no need to use hisi_thermal_round_temp. Signed-off-by: Kevin Wangtao Tested-by: Daniel Lezcano # hikey6220 Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index b9e4a9a..b48e47e 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -40,7 +40,7 @@ #define HISI_TEMP_BASE (-60000) #define HISI_TEMP_RESET (100000) -#define HISI_TEMP_STEP (784) +#define HISI_TEMP_STEP (785) #define HISI_TEMP_LAG (3500) #define HISI_MAX_SENSORS 4 @@ -63,19 +63,19 @@ struct hisi_thermal_data { /* * The temperature computation on the tsensor is as follow: * Unit: millidegree Celsius - * Step: 255/200 (0.7843) + * Step: 200/255 (0.7843) * Temperature base: -60°C * - * The register is programmed in temperature steps, every step is 784 + * The register is programmed in temperature steps, every step is 785 * millidegree and begins at -60 000 m°C * * The temperature from the steps: * - * Temp = TempBase + (steps x 784) + * Temp = TempBase + (steps x 785) * * and the steps from the temperature: * - * steps = (Temp - TempBase) / 784 + * steps = (Temp - TempBase) / 785 * */ static inline int hisi_thermal_step_to_temp(int step) @@ -85,13 +85,7 @@ static inline int hisi_thermal_step_to_temp(int step) static inline int hisi_thermal_temp_to_step(int temp) { - return (temp - HISI_TEMP_BASE) / HISI_TEMP_STEP; -} - -static inline int hisi_thermal_round_temp(int temp) -{ - return hisi_thermal_step_to_temp( - hisi_thermal_temp_to_step(temp)); + return DIV_ROUND_UP(temp - HISI_TEMP_BASE, HISI_TEMP_STEP); } /* @@ -127,7 +121,7 @@ static inline int hisi_thermal_round_temp(int temp) */ static inline void hisi_thermal_set_lag(void __iomem *addr, int value) { - writel((value / HISI_TEMP_STEP) & 0x1F, addr + TEMP0_LAG); + writel(DIV_ROUND_UP(value, HISI_TEMP_STEP) & 0x1F, addr + TEMP0_LAG); } static inline void hisi_thermal_alarm_clear(void __iomem *addr, int value) @@ -274,7 +268,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev, for (i = 0; i < of_thermal_get_ntrips(sensor->tzd); i++) { if (trip[i].type == THERMAL_TRIP_PASSIVE) { - sensor->thres_temp = hisi_thermal_round_temp(trip[i].temperature); + sensor->thres_temp = trip[i].temperature; break; } }