From patchwork Fri Jan 19 15:55:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 125178 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp351877ljf; Fri, 19 Jan 2018 07:55:57 -0800 (PST) X-Google-Smtp-Source: ACJfBotnfJ4UK4efeJ2E/wJ5yNEonyjDr9E6NxRoFLioYNsHoZvzxl2dL135CboWMkXOTLJO+IL6 X-Received: by 2002:a17:902:9005:: with SMTP id a5-v6mr1811694plp.251.1516377356956; Fri, 19 Jan 2018 07:55:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516377356; cv=none; d=google.com; s=arc-20160816; b=V4tb9AKjv8Z0vpvMkr5JgFv/uv905QhZfd1EzC3FyK9kfxiC+12t5Tg26pqewDB/9p mh34m88Ce4Ynpjz/HWaQt8l/GtpfVet0T7KOxU3Hh6XVIuHmfWjVFIfL+PHqhSG60xnt eAh3igKToxs+4WW8svrIEMg11Kd/rillr7n1HmjF/KAp00+4XwRlp06kYZE9Pe04ZGuu 9QFP6MLmA37F0XxSR/QiuvgH3YvUEEwdDxWuQ1r5ihPgXq9LDjVBCjh8mKIWDLcAYaBb bbbuHPYiP7PhgtypjcwIzLlJxtU7i8EufDvwBlxVfm3sh6Wfxrg5oL1iA77m1HNk+vrd tBTg== 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=+CYyxrVVxNH+8Ei+RzyXZs/ZSdycdi/I3Lbu7pw+1BE=; b=lOdFlDS81TCdpBmJ20DS9KPjO7Od2RFjAEC+rBVF5CYWYa6N4dRnZVxMlLJZokkkhX D5ruPGM51fQy4hpYo96TtP1ht0KdQI8OcmM8miPvR++adGepbmLs6OHcMVx13HLone7V E+LEYX8PgVV4SJjV8wl2NJrqecAQ5YFQPAXYhkknSDNul5hIrRwaqijhyGO7x/oHdYsH ljffTuqkykfPa1qhOZM3YnNKcVrPc9kyvoLMrhWdYLpJc2i+p7gJodF8urnMXA5ulhYl qH6Q8LSVzdaSBjijPRHfJ/4/+wnKFGmm0rKsnwrlaUAWKYQpktBY7ZiJsPw3ZsQQaPC7 Trgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=qmN4jeNg; 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 x12-v6si919617pln.126.2018.01.19.07.55.56; Fri, 19 Jan 2018 07:55:56 -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=qmN4jeNg; 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 S1755825AbeASPzw (ORCPT + 28 others); Fri, 19 Jan 2018 10:55:52 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:44136 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755524AbeASPze (ORCPT ); Fri, 19 Jan 2018 10:55:34 -0500 Received: by mail-wr0-f195.google.com with SMTP id w50so1967965wrc.11 for ; Fri, 19 Jan 2018 07:55:34 -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=+CYyxrVVxNH+8Ei+RzyXZs/ZSdycdi/I3Lbu7pw+1BE=; b=qmN4jeNg2RMqC2pSggEZNpo8MF4cqQp0h3wKCX8LuQ2MROFG7PTuJ7afWUyVx0sael M7/5lJqJi4YO0IpHqiA5KUKJ0sB7hwCERu92gyqKJU4HyTLn3kzCp0PYE54/Lcw5K1bk uc/3cpg0qfgC4pucI2DeTIjKMdN98vVxFnTiCnvS3proY0VFtYtw4Q6NPNJW3RCZOnks S/0V71hrVL2WfRzVB0fnRk4b7Pvp7f0RldBlAEEXq1NiPE8MwaQIHtlU4pEmGvgYQPG9 y3vKgFOVpmZd69NGbmyesi0q/bY8/PQQslGKH7NPT0ZgEiZRZTzIPdPb8YnqYWnL0wBT aTRA== 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=+CYyxrVVxNH+8Ei+RzyXZs/ZSdycdi/I3Lbu7pw+1BE=; b=bDYYMyRYSLfqTXiQrW/j1qbVn/ApcNnYKdM77+UjFkpwicHVwxU5MDCoD0JlU59tdj fiE8hAl59XOvGj0KdV2H0C7K7Z1vTE4X+S1JZ9c4A/ivTq6rShGBmv7OXCteISIjTxXG 3H3N9YbCgw8XdZFeUlJOMMvgtPJ5hNVsU4nX5gOgFCXnwvVpu2vgCvSiTHEcC55wMbwH pwwS1Fqa1n+BubPm6uf7RWjtM9l5pvkCnOa//TqY/kBPPumA3G+zh3ncqQHwgscL7p0o x85H5Py5YQeK555ZxhRHc0IqVT9lPOXGIR4TlKHooMhz/hffsi0/VYiYtzGTmEMwDf0c Yk3Q== X-Gm-Message-State: AKwxytcMnOQBAQc/LFtgGRp0yY4PRVCj0/wB6vdoYv04MTuEVIYuORTz ml0d7nXzJsULXEaxcmhs8RL1LQ== X-Received: by 10.223.134.227 with SMTP id 32mr10601104wry.176.1516377333534; Fri, 19 Jan 2018 07:55:33 -0800 (PST) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id w73sm25883027wrb.34.2018.01.19.07.55.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2018 07:55:32 -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 v2 1/9] clk: meson: check pll rate param table before using it Date: Fri, 19 Jan 2018 16:55:21 +0100 Message-Id: <20180119155529.11532-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180119155529.11532-1-jbrunet@baylibre.com> References: <20180119155529.11532-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 plls don't provide it, which is ok since the table is not used by read-only clocks. R/W clocks 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];