Skip to content

Commit

Permalink
clk: at91: pll: fix input range validity check
Browse files Browse the repository at this point in the history
The PLL impose a certain input range to work correctly, but it appears that
this input range does not apply on the input clock (or parent clock) but
on the input clock after it has passed the PLL divisor.
Fix the implementation accordingly.

Cc: <stable@vger.kernel.org> # v3.14+
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Reported-by: Jonas Andersson <jonas@microbit.se>
  • Loading branch information
Boris Brezillon committed Jun 19, 2015
1 parent 03bc10a commit 6c7b03e
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions drivers/clk/at91/clk-pll.c
Original file line number Diff line number Diff line change
@@ -173,8 +173,7 @@ static long clk_pll_get_best_div_mul(struct clk_pll *pll, unsigned long rate,
int i = 0;

/* Check if parent_rate is a valid input rate */
if (parent_rate < characteristics->input.min ||
parent_rate > characteristics->input.max)
if (parent_rate < characteristics->input.min)
return -ERANGE;

/*
@@ -187,6 +186,15 @@ static long clk_pll_get_best_div_mul(struct clk_pll *pll, unsigned long rate,
if (!mindiv)
mindiv = 1;

if (parent_rate > characteristics->input.max) {
tmpdiv = DIV_ROUND_UP(parent_rate, characteristics->input.max);
if (tmpdiv > PLL_DIV_MAX)
return -ERANGE;

if (tmpdiv > mindiv)
mindiv = tmpdiv;
}

/*
* Calculate the maximum divider which is limited by PLL register
* layout (limited by the MUL or DIV field size).

0 comments on commit 6c7b03e

Please sign in to comment.