Skip to content

Commit

Permalink
clk: socfpga: Fix integer overflow in clock calculation
Browse files Browse the repository at this point in the history
Use 64-bit integer for calculating clock rate. Also use do_div for the
64-bit division.

Signed-off-by: Graham Moore <grmoore@altera.com>
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
  • Loading branch information
Dinh Nguyen authored and Mike Turquette committed Feb 26, 2014
1 parent 2c97ec5 commit 5585f73
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/clk/socfpga/clk-pll.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hwclk,
unsigned long parent_rate)
{
struct socfpga_pll *socfpgaclk = to_socfpga_clk(hwclk);
unsigned long divf, divq, vco_freq, reg;
unsigned long divf, divq, reg;
unsigned long long vco_freq;
unsigned long bypass;

reg = readl(socfpgaclk->hw.reg);
Expand All @@ -54,8 +55,9 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hwclk,

divf = (reg & SOCFPGA_PLL_DIVF_MASK) >> SOCFPGA_PLL_DIVF_SHIFT;
divq = (reg & SOCFPGA_PLL_DIVQ_MASK) >> SOCFPGA_PLL_DIVQ_SHIFT;
vco_freq = parent_rate * (divf + 1);
return vco_freq / (1 + divq);
vco_freq = (unsigned long long)parent_rate * (divf + 1);
do_div(vco_freq, (1 + divq));
return (unsigned long)vco_freq;
}

static struct clk_ops clk_pll_ops = {
Expand Down

0 comments on commit 5585f73

Please sign in to comment.