summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@gmail.com>2017-04-12 12:29:23 -0400
committerThierry Reding <thierry.reding@gmail.com>2017-04-13 11:34:54 -0400
commit6db78b201b3fa3611b9557f0d677cd4560358f9d (patch)
tree6a8601d0f02f647d29193005f8bd715f3c3922f8
parent4a813b262f85ac34c9f3e557d9be79f846a381df (diff)
pwm: tegra: Avoid potential overflow for short periods
For very short periods, the result of the division might overflow the unsigned long hz variable (on 32-bit architectures). Avoid that by making it an unsigned long long. While at it, also remove an unneeded local variable whose only purpose is to store a temporary computation. Acked-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-rw-r--r--drivers/pwm/pwm-tegra.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
index 9c7f180b9f3a..c040f87ee144 100644
--- a/drivers/pwm/pwm-tegra.c
+++ b/drivers/pwm/pwm-tegra.c
@@ -75,9 +75,8 @@ static int tegra_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
75 int duty_ns, int period_ns) 75 int duty_ns, int period_ns)
76{ 76{
77 struct tegra_pwm_chip *pc = to_tegra_pwm_chip(chip); 77 struct tegra_pwm_chip *pc = to_tegra_pwm_chip(chip);
78 unsigned long long c = duty_ns; 78 unsigned long long c = duty_ns, hz;
79 unsigned long rate, hz; 79 unsigned long rate;
80 unsigned long long ns100 = NSEC_PER_SEC;
81 u32 val = 0; 80 u32 val = 0;
82 int err; 81 int err;
83 82
@@ -98,9 +97,8 @@ static int tegra_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
98 rate = clk_get_rate(pc->clk) >> PWM_DUTY_WIDTH; 97 rate = clk_get_rate(pc->clk) >> PWM_DUTY_WIDTH;
99 98
100 /* Consider precision in PWM_SCALE_WIDTH rate calculation */ 99 /* Consider precision in PWM_SCALE_WIDTH rate calculation */
101 ns100 *= 100; 100 hz = DIV_ROUND_CLOSEST_ULL(100ULL * NSEC_PER_SEC, period_ns);
102 hz = DIV_ROUND_CLOSEST_ULL(ns100, period_ns); 101 rate = DIV_ROUND_CLOSEST_ULL(100ULL * rate, hz);
103 rate = DIV_ROUND_CLOSEST(rate * 100, hz);
104 102
105 /* 103 /*
106 * Since the actual PWM divider is the register's frequency divider 104 * Since the actual PWM divider is the register's frequency divider