diff mbox

clk: divider: fix clk_round_rate() when CLK_DIVIDER_READ_ONLY && CLK_RATE_SET_PARENT

Message ID 1515262769-22665-1-git-send-email-david@lechnology.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

David Lechner Jan. 6, 2018, 6:19 p.m. UTC
clk_round_rate() 'answers the question "if I were to pass @rate to
clk_set_rate(), what clock rate would I end up with?" without changing
the hardware'.

Currently, clk_divider_round_rate() returns the "current value" when
divider->flags & CLK_DIVIDER_READ_ONLY. But, if CLK_SET_RATE_PARENT is
set, then clk_set_rate() is supposed to propagate the rate change to the
parent clock. So, we need to do check for CLK_SET_RATE_PARENT and if it
is set, ask the parent clock what rate it can provide given the current
divider value.

Signed-off-by: David Lechner <david@lechnology.com>
---
 drivers/clk/clk-divider.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Stephen Boyd Jan. 10, 2018, 10:03 p.m. UTC | #1
On 01/06, David Lechner wrote:
> clk_round_rate() 'answers the question "if I were to pass @rate to
> clk_set_rate(), what clock rate would I end up with?" without changing
> the hardware'.
> 
> Currently, clk_divider_round_rate() returns the "current value" when
> divider->flags & CLK_DIVIDER_READ_ONLY. But, if CLK_SET_RATE_PARENT is
> set, then clk_set_rate() is supposed to propagate the rate change to the
> parent clock. So, we need to do check for CLK_SET_RATE_PARENT and if it
> is set, ask the parent clock what rate it can provide given the current
> divider value.
> 
> Signed-off-by: David Lechner <david@lechnology.com>

Jerome sent a patch the day before that probably addresses the
same thing. See the message-id of 20180105170959.17266-2-jbrunet@baylibre.com
for more info.
David Lechner Jan. 11, 2018, 11:10 p.m. UTC | #2
On 01/10/2018 04:03 PM, Stephen Boyd wrote:
> On 01/06, David Lechner wrote:
>> clk_round_rate() 'answers the question "if I were to pass @rate to
>> clk_set_rate(), what clock rate would I end up with?" without changing
>> the hardware'.
>>
>> Currently, clk_divider_round_rate() returns the "current value" when
>> divider->flags & CLK_DIVIDER_READ_ONLY. But, if CLK_SET_RATE_PARENT is
>> set, then clk_set_rate() is supposed to propagate the rate change to the
>> parent clock. So, we need to do check for CLK_SET_RATE_PARENT and if it
>> is set, ask the parent clock what rate it can provide given the current
>> divider value.
>>
>> Signed-off-by: David Lechner <david@lechnology.com>
> 
> Jerome sent a patch the day before that probably addresses the
> same thing. See the message-id of 20180105170959.17266-2-jbrunet@baylibre.com
> for more info.
> 

Indeed, thank you. We can drop this patch.
--
To unsubscribe from this list: send the line "unsubscribe linux-clk" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 4ed516c..cffe9ef 100644
--- a/drivers/clk/clk-divider.c
+++ b/drivers/clk/clk-divider.c
@@ -357,6 +357,13 @@  static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate,
 		bestdiv &= div_mask(divider->width);
 		bestdiv = _get_div(divider->table, bestdiv, divider->flags,
 			divider->width);
+
+		if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
+			struct clk_hw *parent = clk_hw_get_parent(hw);
+
+			*prate = clk_hw_round_rate(parent, rate * bestdiv);
+		}
+
 		return DIV_ROUND_UP_ULL((u64)*prate, bestdiv);
 	}