Skip to contentSkip to conversation

pwm: bcm-iproc: handle clk_get_rate() return

PATCH Applied Scott Branden 4 participants 4 messages Jul 18, 2020 – Jul 27, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 pwm: bcm-iproc: handle clk_get_rate() return

From: Rayagonda Kokatanur <[email protected]>

Handle clk_get_rate() returning 0 to avoid possible division by zero.

Fixes daa5abc41c80 ("pwm: Add support for Broadcom iProc PWM controller")

---
Changes from v3: fixed typo in commit message: Reviewed-off-by. Hopefully everything clean now.
Changes from v2: update commit message to remove <= condition as clk_get_rate only returns value >= 0

---
 drivers/pwm/pwm-bcm-iproc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pwm/pwm-bcm-iproc.c +7 -2
index 1f829edd8ee7..d392a828fc49 100644
@@ -85,8 +85,6 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
 	u64 tmp, multi, rate;
 	u32 value, prescale;
 
-	rate = clk_get_rate(ip->clk);
-
 	value = readl(ip->base + IPROC_PWM_CTRL_OFFSET);
 
 	if (value & BIT(IPROC_PWM_CTRL_EN_SHIFT(pwm->hwpwm)))
@@ -99,6 +97,13 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
 	else
 		state->polarity = PWM_POLARITY_INVERSED;
 
+	rate = clk_get_rate(ip->clk);
+	if (rate == 0) {
+		state->period = 0;
+		state->duty_cycle = 0;
+		return;
+	}
+
 	value = readl(ip->base + IPROC_PWM_PRESCALE_OFFSET);
 	prescale = value >> IPROC_PWM_PRESCALE_SHIFT(pwm->hwpwm);
 	prescale &= IPROC_PWM_PRESCALE_MAX;
Signature · 1 line
2.17.1
#1 lore raw

Hi Thierry/Uwe,

Do you have any further comment on this patch? If not, could you please help to pick it up?

Thanks,

Ray

Quoted 46 lines · Scott Branden

From: Rayagonda Kokatanur <[email protected]>

Handle clk_get_rate() returning 0 to avoid possible division by zero.

Fixes daa5abc41c80 ("pwm: Add support for Broadcom iProc PWM controller")

---
Changes from v3: fixed typo in commit message: Reviewed-off-by. Hopefully everything clean now.
Changes from v2: update commit message to remove <= condition as clk_get_rate only returns value >= 0

---
 drivers/pwm/pwm-bcm-iproc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pwm/pwm-bcm-iproc.c +7 -2
index 1f829edd8ee7..d392a828fc49 100644
@@ -85,8 +85,6 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
 	u64 tmp, multi, rate;
 	u32 value, prescale;
 
-	rate = clk_get_rate(ip->clk);
-
 	value = readl(ip->base + IPROC_PWM_CTRL_OFFSET);
 
 	if (value & BIT(IPROC_PWM_CTRL_EN_SHIFT(pwm->hwpwm)))
@@ -99,6 +97,13 @@ static void iproc_pwmc_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
 	else
 		state->polarity = PWM_POLARITY_INVERSED;
 
+	rate = clk_get_rate(ip->clk);
+	if (rate == 0) {
+		state->period = 0;
+		state->duty_cycle = 0;
+		return;
+	}
+
 	value = readl(ip->base + IPROC_PWM_PRESCALE_OFFSET);
 	prescale = value >> IPROC_PWM_PRESCALE_SHIFT(pwm->hwpwm);
 	prescale &= IPROC_PWM_PRESCALE_MAX;
Reviewed-by on v4 1/1
#2 lore raw
In reply to Scott Branden
Quoted 8 lines · Scott Branden

From: Rayagonda Kokatanur <[email protected]>

Handle clk_get_rate() returning 0 to avoid possible division by zero.

Fixes daa5abc41c80 ("pwm: Add support for Broadcom iProc PWM controller")

LGTM

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
#3 lore raw
In reply to Scott Branden
Quoted 9 lines · Scott Branden

From: Rayagonda Kokatanur <[email protected]>

Handle clk_get_rate() returning 0 to avoid possible division by zero.

Fixes daa5abc41c80 ("pwm: Add support for Broadcom iProc PWM controller")
Quoted 8 lines

---
Changes from v3: fixed typo in commit message: Reviewed-off-by. Hopefully everything clean now.
Changes from v2: update commit message to remove <= condition as clk_get_rate only returns value >= 0

---
 drivers/pwm/pwm-bcm-iproc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Applied, thanks.

Thierry