From patchwork Thu Jan 18 18:45:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 125003 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp247204lja; Thu, 18 Jan 2018 10:45:44 -0800 (PST) X-Google-Smtp-Source: ACJfBosWO8tvpseThPnkpEPDI2sEW5kkevyGKlFddepPHt0GehkgBx+4oPFrg9CfCw2MVLS+WkbC X-Received: by 10.98.144.213 with SMTP id q82mr17617654pfk.59.1516301144379; Thu, 18 Jan 2018 10:45:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516301144; cv=none; d=google.com; s=arc-20160816; b=wDC+7u4iEQHITgmqVZBqRTeIkbVhuWl9MKr8hCo264EMd3PeTNFFneUoD2Il2TyxDt e+9lZlQ5CZfObuXj0eV03uo0nCkCnd8kbltCmgE2/QBKASnK7Zm3DO2I3KSho8HXYu7F o3YZ1X+nP1x2NQPD+sOtVCGaEa4oJb29cYk2mTYgXy6/YSXlX0SqsWaiRtWSsxgbgiH0 9WBqrBwHRntc6XxBhspQbRcF1GJ8NxQq1+XEoc2RiP3FDTuGBCnhlJXd6lrBWUeF+QQ+ CHgQZCsiASi9AsxVdPjJk1DDpZfcnNzWJNIwcc1JRfLQoI9yAFnZWYxzEcmbTF/ZqC+r E+zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=RItXkslxKZcjuxPXqK8QX2m70p44JFKu6G7KWp9RBIE=; b=BB7pJuNb1PSRYyDLABVtT6gjKhqIFCVNqcSKFFgY02ckH3oB0AhyxbKx2y9+a80l8Q GUnjVvsFgcFtyic7sAVSHFYFc0pG9jxKQUuCFmAl8MqAnzeg8Zmi6zIyaopnwHlpiONN hBOfOohWIVTMmNUjpn49J09/ouy3c7r1sTnnnXJ9JIzQZ4ZLOsVFmJnbf9EflWL0NMH6 Tk+BMPMOrUP6QmuUu9jhh3u/kF/i3IYhxiCWvgMS36kh6a/soBMpXElx51hc7L4m6S6G aedTdtZjkqzL2XUo0WJj3he8LZI4sMCJ/VAzGmKO2Pm6Hjec8oUuLGnZESeqQaSzT42U 2AXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=lIzXOeAx; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a11-v6si113495plt.567.2018.01.18.10.45.44; Thu, 18 Jan 2018 10:45:44 -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 header.s=20150623 header.b=lIzXOeAx; 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 S1755791AbeARSpl (ORCPT + 28 others); Thu, 18 Jan 2018 13:45:41 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:38320 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755383AbeARSph (ORCPT ); Thu, 18 Jan 2018 13:45:37 -0500 Received: by mail-wr0-f196.google.com with SMTP id x1so19457787wrb.5 for ; Thu, 18 Jan 2018 10:45:36 -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=RItXkslxKZcjuxPXqK8QX2m70p44JFKu6G7KWp9RBIE=; b=lIzXOeAxpVl/CRATU+8FpCYZllldGrKvj1oVWNsiFvxVa/5r1Olo8aCydD/9fz40Ex UdwzhnOzqQru3WfZdZS0OuVgnRB7HiBs4nONXPiZ4Zvu1ITf+h1iggyVyWFma1WP/njB Q0v9/zN5RpBzvWlp/ljXV9bxQ9XQ9uuAvHYPGd99EDLRAVY3PtlWrZKoEYAWfh2eGVG6 oa7/+LjyNenSV8pbk6QtwoxExtNNxL7vug5d5UsG7zxVxOmUr8Kd+zZEmQ/Ksv/QKR2k gr2dCzf++PkJgxCOfsgx5lHkA5tYZRa3ifXEDJk/VTbTig44GvE5pJf0dq17Ta6Yqvj1 3pfg== 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; bh=RItXkslxKZcjuxPXqK8QX2m70p44JFKu6G7KWp9RBIE=; b=I+pfZhL39mlVD7US+jiwSaswiasVlT54FFHNohxAMrnZU9VeDga5ehf7A01RMXP/eX 963tF+P4A6UV5e0ECZMYbrJf4blwofb8UUFswaphCJS041+Zra8OzjPfLnOL8BpwQaf9 toHIaMBDMPbAatQw+/RSV+/OpoE91kQtCLwH++z7grpvdWTzjGhH7fnjEbF7soLmoCaS Fe3dwcSyp72/d6WVCbAN4dPGrwym3nNSxBwwiRV234yDeJNWovmwx5p+3RM2yriTTeXp CVBb6b0MA7IVKYx20OvPUANvIlCefQYB0DCZVJneora11ALECANMRCscPZeBtmmXQaHZ P65A== X-Gm-Message-State: AKwxytfiFqvbbMUINvIXqVDvh4pHrMvDlNApNitXdXiRbHwhZELNgzD+ bIEEf9AAMPsMGKPlgPa0nMz9og== X-Received: by 10.223.158.131 with SMTP id a3mr7496997wrf.83.1516301136235; Thu, 18 Jan 2018 10:45:36 -0800 (PST) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id y62sm6240236wrb.48.2018.01.18.10.45.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2018 10:45:35 -0800 (PST) From: Jerome Brunet To: Neil Armstrong Cc: Jerome Brunet , Kevin Hilman , Carlo Caione , Michael Turquette , Stephen Boyd , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/9] clk: meson: check pll rate param table before using it Date: Thu, 18 Jan 2018 19:45:24 +0100 Message-Id: <20180118184532.6856-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180118184532.6856-1-jbrunet@baylibre.com> References: <20180118184532.6856-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Make sure the rate param table is available before using it. Some read-only pll don't provide it, which is ok because the table is not used by read-only clock. R/W clock are supposed to provide it, but it does not hurt check it. Signed-off-by: Jerome Brunet --- drivers/clk/meson/clk-pll.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.14.3 diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index 01341553f50b..2614341fc4ad 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -94,6 +94,13 @@ static long meson_clk_pll_round_rate(struct clk_hw *hw, unsigned long rate, const struct pll_rate_table *rate_table = pll->rate_table; int i; + /* + * if the table is missing, just return the current rate + * since we don't have the other available frequencies + */ + if (!rate_table) + return meson_clk_pll_recalc_rate(hw, *parent_rate); + for (i = 0; i < pll->rate_count; i++) { if (rate <= rate_table[i].rate) return rate_table[i].rate; @@ -109,6 +116,9 @@ static const struct pll_rate_table *meson_clk_get_pll_settings(struct meson_clk_ const struct pll_rate_table *rate_table = pll->rate_table; int i; + if (!rate_table) + return NULL; + for (i = 0; i < pll->rate_count; i++) { if (rate == rate_table[i].rate) return &rate_table[i];