From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753715AbeAKXIW (ORCPT + 1 other); Thu, 11 Jan 2018 18:08:22 -0500 Received: from vern.gendns.com ([206.190.152.46]:43510 "EHLO vern.gendns.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751757AbeAKXIT (ORCPT ); Thu, 11 Jan 2018 18:08:19 -0500 Subject: Re: [3/5] clk: divider: add divider_ro_round_rate helper To: Jerome Brunet , Stephen Boyd , Michael Turquette , linux-clk@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Vladimir Zapolskiy , Sylvain Lemieux , Andy Gross , David Brown References: <20180105170959.17266-4-jbrunet@baylibre.com> From: David Lechner Message-ID: Date: Thu, 11 Jan 2018 17:08:18 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180105170959.17266-4-jbrunet@baylibre.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - vern.gendns.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lechnology.com X-Get-Message-Sender-Via: vern.gendns.com: authenticated_id: davidmain+lechnology.com/only user confirmed/virtual account not confirmed X-Authenticated-Sender: vern.gendns.com: davidmain@lechnology.com X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 01/05/2018 11:09 AM, Jerome Brunet wrote: > Like divider_round_rate, a couple a of driver are doing more or less > the same operation to round the rate of the divider when it is read-only. > > We can factor this code so let's provide an helper function for this Perhaps you could also make use of this new helper here (clk-divider.c): const struct clk_ops clk_divider_ro_ops = { .recalc_rate = clk_divider_recalc_rate, .round_rate = clk_divider_round_rate, }; EXPORT_SYMBOL_GPL(clk_divider_ro_ops); > > Signed-off-by: Jerome Brunet > --- > drivers/clk/clk-divider.c | 43 ++++++++++++++++++++++++++++--------------- > include/linux/clk-provider.h | 15 +++++++++++++++ > 2 files changed, 43 insertions(+), 15 deletions(-) > > diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c > index a851d3e04c7f..3eb2b27f3513 100644 > --- a/drivers/clk/clk-divider.c > +++ b/drivers/clk/clk-divider.c > @@ -344,29 +344,42 @@ long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent, > } > EXPORT_SYMBOL_GPL(divider_round_rate_parent); > It is nice to have documentation comments on public functions. Especially in this case where @prate is an in/out parameter and @table is optional. > +long divider_ro_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent, > + unsigned long rate, unsigned long *prate, > + const struct clk_div_table *table, u8 width, > + unsigned long flags, unsigned int val) > +{ > + int div; > + > + div = _get_div(table, val, flags, width); > + > + /* Even a read-only clock can propagate a rate change */ > + if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { > + if (!parent) > + return -EINVAL; > + > + *prate = clk_hw_round_rate(parent, rate * div); > + } > + > + return DIV_ROUND_UP_ULL((u64)*prate, div); > +} > +EXPORT_SYMBOL_GPL(divider_ro_round_rate_parent); > + > + > static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate, > unsigned long *prate) > { > struct clk_divider *divider = to_clk_divider(hw); > - struct clk_hw *hw_parent = clk_hw_get_parent(hw); > - int bestdiv; > + u32 val; > > /* if read only, just return current value */ > if (divider->flags & CLK_DIVIDER_READ_ONLY) { > - bestdiv = clk_readl(divider->reg) >> divider->shift; > - bestdiv &= div_mask(divider->width); > - bestdiv = _get_div(divider->table, bestdiv, divider->flags, > - divider->width); > - > - /* Even a read-only clock can propagate a rate change */ > - if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) { > - if (!hw_parent) > - return -EINVAL; > - > - *prate = clk_hw_round_rate(hw_parent, rate * bestdiv); > - } > + val = clk_readl(divider->reg) >> divider->shift; > + val &= div_mask(divider->width); > > - return DIV_ROUND_UP_ULL((u64)*prate, bestdiv); > + return divider_ro_round_rate(hw, rate, prate, divider->table, > + divider->width, divider->flags, > + val); > } > > return divider_round_rate(hw, rate, prate, divider->table, > diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h > index 175a62a15619..eb2c3a035e98 100644 > --- a/include/linux/clk-provider.h > +++ b/include/linux/clk-provider.h > @@ -417,6 +417,10 @@ long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent, > unsigned long rate, unsigned long *prate, > const struct clk_div_table *table, > u8 width, unsigned long flags); > +long divider_ro_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent, > + unsigned long rate, unsigned long *prate, > + const struct clk_div_table *table, u8 width, > + unsigned long flags, unsigned int val); > int divider_get_val(unsigned long rate, unsigned long parent_rate, > const struct clk_div_table *table, u8 width, > unsigned long flags); > @@ -772,6 +776,17 @@ static inline long divider_round_rate(struct clk_hw *hw, unsigned long rate, > rate, prate, table, width, flags); > } > Same here (about documentation comment). > +static inline long divider_ro_round_rate(struct clk_hw *hw, unsigned long rate, > + unsigned long *prate, > + const struct clk_div_table *table, > + u8 width, unsigned long flags, > + unsigned int val) > +{ > + return divider_ro_round_rate_parent(hw, clk_hw_get_parent(hw), > + rate, prate, table, width, flags, > + val); > +} > + > /* > * FIXME clock api without lock protection > */ >