From patchwork Thu Dec 1 17:15:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 86120 Delivered-To: patch@linaro.org Received: by 10.182.112.6 with SMTP id im6csp1008287obb; Thu, 1 Dec 2016 09:17:33 -0800 (PST) X-Received: by 10.84.206.37 with SMTP id f34mr86587905ple.35.1480612653033; Thu, 01 Dec 2016 09:17:33 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g19si874441pfa.167.2016.12.01.09.17.32; Thu, 01 Dec 2016 09:17:33 -0800 (PST) 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=@baylibre-com.20150623.gappssmtp.com; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760460AbcLARRO (ORCPT + 25 others); Thu, 1 Dec 2016 12:17:14 -0500 Received: from mail-wj0-f179.google.com ([209.85.210.179]:34067 "EHLO mail-wj0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754446AbcLARQZ (ORCPT ); Thu, 1 Dec 2016 12:16:25 -0500 Received: by mail-wj0-f179.google.com with SMTP id mp19so211042264wjc.1 for ; Thu, 01 Dec 2016 09:15:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sFZjVvsjq5rYEdJQ7rcrzVZJoHe5JmanD29otB7SqsY=; b=x6HAe4fcNOAQ1hnjDxgKdsdOT0ZJUxys3+f17kp/zP0g50Vkqh925DJIOCMlwzXy+7 Lg3j916XvTEARNNLz00x2zlZoChW6pL4xoKJgMibGLMZpGLeIkmN1Qcxq55Mfamxeic6 aNfbLlXL8MMVmNnXzSoGzb6Y8keffUl1ghQwEIyNXe8pkA/cGhZswhqjOfKWNKsz5qYM nPnnYSX15hczAdIQlbj7TO2GU50hE7ziT5sE6WAGwbcRcN8edY+eXE34X0N+qU8cdszN pqRewK0Kn6CK/AKo69RBvRJpWsK0lJ2uz5W2IDuHw5qqOMOW1dj8V56bKcYImLxnZXo7 1gBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sFZjVvsjq5rYEdJQ7rcrzVZJoHe5JmanD29otB7SqsY=; b=bsRDCLU91U310K9YSi9LUKt/ulBLeXvdgi4sf2dzUzauHpZedkClBTmMItAUi8RqML WbdW2gaEOGA2+nv4wMtE4jntAQEoNE+Xf6SZjjFDkQGj2CINfXu5OrUD+KNsP95i724x 2TQRDhm+qIe1U92r8i/dWHh37eTXfi5Aa4K7NqKr5GfVcx1yd8U9LFZrCpd6fUHfiz80 Ru7p80YkFhzesoTqcOV2G2+p4BFMAnPGEMu+JfOGNwd8XObL7THYT5BcqNIFLr4sReDb ++xHZOTzgcdfVnA8vFpQHdWNNDXcUkAxiLJ8iia9bX4A21su55Yu0hKrW14xWrzJTvnx 6QSw== X-Gm-Message-State: AKaTC011iwBt1GURu2q+AzUfY+NGWy4XPV8HHYx74u4L7cA6TIJoR4O9xGlBtdWbjIT206yM X-Received: by 10.194.58.198 with SMTP id t6mr32994990wjq.44.1480612528412; Thu, 01 Dec 2016 09:15:28 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id a13sm14261527wma.18.2016.12.01.09.15.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 09:15:27 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Michael Turquette , Sekhar Nori , Peter Ujfalusi , Russell King Cc: LKML , arm-soc , Bartosz Golaszewski Subject: [PATCH 3/3] ARM: da850: fix da850_set_pll0rate() Date: Thu, 1 Dec 2016 18:15:16 +0100 Message-Id: <1480612516-18853-4-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1480612516-18853-1-git-send-email-bgolaszewski@baylibre.com> References: <1480612516-18853-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function is broken - its second argument is an index to the freq table, not the requested clock rate in Hz. It leads to an oops when called from clk_set_rate() since this argument isn't bounds checked either. Fix it by iterating over the array of supported frequencies and selecting a one that matches or returning -EINVAL for unsupported rates. Signed-off-by: Bartosz Golaszewski --- arch/arm/mach-davinci/da850.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) -- 2.9.3 diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 855b720..1c0f296 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -1173,14 +1173,28 @@ static int da850_set_armrate(struct clk *clk, unsigned long index) return clk_set_rate(pllclk, index); } -static int da850_set_pll0rate(struct clk *clk, unsigned long index) +static int da850_set_pll0rate(struct clk *clk, unsigned long requested_rate) { - unsigned int prediv, mult, postdiv; - struct da850_opp *opp; struct pll_data *pll = clk->pll_data; + struct cpufreq_frequency_table *freq; + unsigned int prediv, mult, postdiv; + struct da850_opp *opp = NULL; int ret; - opp = (struct da850_opp *) cpufreq_info.freq_table[index].driver_data; + for (freq = da850_freq_table; + freq->frequency != CPUFREQ_TABLE_END; freq++) { + /* requested_rate is in Hz, freq->frequency is in KHz */ + unsigned long freq_rate = freq->frequency * 1000; + + if (freq_rate == requested_rate) { + opp = (struct da850_opp *)freq->driver_data; + break; + } + } + + if (opp == NULL) + return -EINVAL; + prediv = opp->prediv; mult = opp->mult; postdiv = opp->postdiv;