From patchwork Wed Dec 2 21:19:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Gamari X-Patchwork-Id: 7753371 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 33F1E9F39D for ; Wed, 2 Dec 2015 21:32:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4843D2054A for ; Wed, 2 Dec 2015 21:32:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72C6D20544 for ; Wed, 2 Dec 2015 21:32:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757512AbbLBVcZ (ORCPT ); Wed, 2 Dec 2015 16:32:25 -0500 Received: from mail.smart-cactus.org ([54.187.36.80]:50831 "EHLO mail.smart-cactus.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757250AbbLBV3Y (ORCPT ); Wed, 2 Dec 2015 16:29:24 -0500 Received: from localhost.localdomain (HSI-KBW-149-172-43-78.hsi13.kabel-badenwuerttemberg.de [149.172.43.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: ben@smart-cactus.org) by mail.smart-cactus.org (Postfix) with ESMTPSA id EAF2464B76; Wed, 2 Dec 2015 21:08:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.smart-cactus.org; s=mail; t=1449090494; bh=4XV/QI1q3DjZFtpLh1jb946JTaqd6IVD30KA/bHPygk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZzuvZvH1Pl76L8sWdDtfM7iizvnk7geXEfvIfJiGOgXb1xuFDEubIKcYyOTlcYcLt JahD1Y/8IznD75jKsehQgcPFhLo81kaMB6q8vd23URHPTzriZXM7snGbTK6Ybp+YB4 gwkrMpGT2fPAMa7Ubog/yoAy3OxesW+L0jeW7ML4= From: Ben Gamari To: Thomas Abraham , Sylwester Nawrocki , Michael Turquette , Kukjin Kim , Kukjin Kim , Viresh Kumar , Krzysztof Kozlowski Cc: Tomasz Figa , Lukasz Majewski , Heiko Stuebner , Chanwoo Choi , Kevin Hilman , Javier Martinez Canillas , Tobias Jakobi , Anand Moon , linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com, Ben Gamari , Javier Martinez Canillas Subject: [PATCH 11/12] cpufreq: arm-big-little: clarify frequency units Date: Wed, 2 Dec 2015 22:19:26 +0100 Message-Id: <1449091167-20758-12-git-send-email-ben@smart-cactus.org> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1449091167-20758-1-git-send-email-ben@smart-cactus.org> References: <1449091167-20758-1-git-send-email-ben@smart-cactus.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The frequency units are very confusing in this area as OPPs use Hz whereas cpufreq uses kHz. Be explicit about this in variable naming. Cc: Javier Martinez Canillas Signed-off-by: Ben Gamari --- drivers/cpufreq/arm_big_little.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c index 855599b..2d5761c 100644 --- a/drivers/cpufreq/arm_big_little.c +++ b/drivers/cpufreq/arm_big_little.c @@ -130,14 +130,14 @@ static unsigned int bL_cpufreq_get_rate(unsigned int cpu) } static int -bL_cpufreq_set_rate_cluster(u32 cpu, u32 cluster, u32 new_rate) +bL_cpufreq_set_rate_cluster(u32 cpu, u32 cluster, u32 new_rate_kHz) { unsigned long volt = 0, volt_old = 0; long freq_Hz; u32 old_rate; int ret; - freq_Hz = new_rate * 1000; + freq_Hz = new_rate_kHz * 1000; old_rate = clk_get_rate(clk[cluster]) / 1000; if (!IS_ERR(reg[cluster])) { @@ -163,10 +163,10 @@ bL_cpufreq_set_rate_cluster(u32 cpu, u32 cluster, u32 new_rate) pr_debug("%s: cpu %d, cluster: %d, %u MHz, %ld mV --> %u MHz, %ld mV\n", __func__, cpu, cluster, old_rate / 1000, (volt_old > 0) ? volt_old / 1000 : -1, - new_rate / 1000, volt ? volt / 1000 : -1); + new_rate_kHz / 1000, volt ? volt / 1000 : -1); /* scaling up? scale voltage before frequency */ - if (!IS_ERR(reg[cluster]) && new_rate > old_rate) { + if (!IS_ERR(reg[cluster]) && new_rate_kHz > old_rate) { ret = regulator_set_voltage_tol(reg[cluster], volt, 0); if (ret) { pr_err("%s: cpu: %d, cluster: %d, failed to scale voltage up: %d\n", @@ -175,7 +175,7 @@ bL_cpufreq_set_rate_cluster(u32 cpu, u32 cluster, u32 new_rate) } } - ret = clk_set_rate(clk[cluster], new_rate * 1000); + ret = clk_set_rate(clk[cluster], new_rate_kHz * 1000); if (WARN_ON(ret)) { pr_err("%s: clk_set_rate failed: %d, cluster: %d\n", __func__, cluster, ret); @@ -185,7 +185,7 @@ bL_cpufreq_set_rate_cluster(u32 cpu, u32 cluster, u32 new_rate) } /* scaling down? scale voltage after frequency */ - if (!IS_ERR(reg[cluster]) && new_rate < old_rate) { + if (!IS_ERR(reg[cluster]) && new_rate_kHz < old_rate) { ret = regulator_set_voltage_tol(reg[cluster], volt, 0); if (ret) { pr_err("%s: cpu: %d, cluster: %d, failed to scale voltage down: %d\n", @@ -199,7 +199,7 @@ bL_cpufreq_set_rate_cluster(u32 cpu, u32 cluster, u32 new_rate) } static unsigned int -bL_cpufreq_set_rate(u32 cpu, u32 old_cluster, u32 new_cluster, u32 rate) +bL_cpufreq_set_rate(u32 cpu, u32 old_cluster, u32 new_cluster, u32 rate_kHz) { u32 new_rate, prev_rate; int ret; @@ -209,13 +209,13 @@ bL_cpufreq_set_rate(u32 cpu, u32 old_cluster, u32 new_cluster, u32 rate) if (bLs) { prev_rate = per_cpu(cpu_last_req_freq, cpu); - per_cpu(cpu_last_req_freq, cpu) = rate; + per_cpu(cpu_last_req_freq, cpu) = rate_kHz; per_cpu(physical_cluster, cpu) = new_cluster; new_rate = find_cluster_maxfreq(new_cluster); new_rate = ACTUAL_FREQ(new_cluster, new_rate); } else { - new_rate = rate; + new_rate = rate_kHz; } pr_debug("%s: cpu: %d, old cluster: %d, new cluster: %d, freq: %d\n", @@ -236,7 +236,7 @@ bL_cpufreq_set_rate(u32 cpu, u32 old_cluster, u32 new_cluster, u32 rate) } else if (ret && bLs) { per_cpu(cpu_last_req_freq, cpu) = prev_rate; per_cpu(physical_cluster, cpu) = old_cluster; - } + } mutex_unlock(&cluster_lock[new_cluster]);