aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/bcm
diff options
context:
space:
mode:
authorRay Jui <rjui@broadcom.com>2015-06-29 17:30:10 -0400
committerStephen Boyd <sboyd@codeaurora.org>2015-07-02 12:51:09 -0400
commit69916d96094e1e16567c5f25515a13ed2896c730 (patch)
tree7b756558d35f725dc8dd31c95c6edd383f07f908 /drivers/clk/bcm
parent45a481c2176f6acca2efb6477c6018b2c3e3c60f (diff)
clk: iproc: fix bit manipulation arithmetic
A 32-bit variable should be type casted to 64-bit before arithmetic operation and assigning it to a 64-bit variable Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Ray Jui <rjui@broadcom.com> Fixes: 5fe225c105fd ("clk: iproc: add initial common clock support") Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/bcm')
-rw-r--r--drivers/clk/bcm/clk-iproc-pll.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/clk/bcm/clk-iproc-pll.c b/drivers/clk/bcm/clk-iproc-pll.c
index a8d971b820b0..2dda4e8295a9 100644
--- a/drivers/clk/bcm/clk-iproc-pll.c
+++ b/drivers/clk/bcm/clk-iproc-pll.c
@@ -366,7 +366,7 @@ static unsigned long iproc_pll_recalc_rate(struct clk_hw *hw,
366 val = readl(pll->pll_base + ctrl->ndiv_int.offset); 366 val = readl(pll->pll_base + ctrl->ndiv_int.offset);
367 ndiv_int = (val >> ctrl->ndiv_int.shift) & 367 ndiv_int = (val >> ctrl->ndiv_int.shift) &
368 bit_mask(ctrl->ndiv_int.width); 368 bit_mask(ctrl->ndiv_int.width);
369 ndiv = ndiv_int << ctrl->ndiv_int.shift; 369 ndiv = (u64)ndiv_int << ctrl->ndiv_int.shift;
370 370
371 if (ctrl->flags & IPROC_CLK_PLL_HAS_NDIV_FRAC) { 371 if (ctrl->flags & IPROC_CLK_PLL_HAS_NDIV_FRAC) {
372 val = readl(pll->pll_base + ctrl->ndiv_frac.offset); 372 val = readl(pll->pll_base + ctrl->ndiv_frac.offset);
@@ -374,7 +374,8 @@ static unsigned long iproc_pll_recalc_rate(struct clk_hw *hw,
374 bit_mask(ctrl->ndiv_frac.width); 374 bit_mask(ctrl->ndiv_frac.width);
375 375
376 if (ndiv_frac != 0) 376 if (ndiv_frac != 0)
377 ndiv = (ndiv_int << ctrl->ndiv_int.shift) | ndiv_frac; 377 ndiv = ((u64)ndiv_int << ctrl->ndiv_int.shift) |
378 ndiv_frac;
378 } 379 }
379 380
380 val = readl(pll->pll_base + ctrl->pdiv.offset); 381 val = readl(pll->pll_base + ctrl->pdiv.offset);