Skip to contentSkip to conversation

pwm: sun4i: Propagate errors in .get_state() to the caller

PATCH In review Andre Przywara 4 participants 5 messages Dec 1, 2022 – Dec 3, 2022

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

PATCH 1/1 pwm: sun4i: Propagate errors in .get_state() to the caller

.get_state() can return an error indication now. Make use of it to propagate an impossible prescaler encoding, should that have sneaked in somehow.
Also check the return value of clk_get_rate(). That's unlikely to fail, but we use that in two divide operations down in the code, so let's avoid a divide-by-zero condition on the way.

---
Hi,

this goes on top of Uwe's series to introduce and observe .get_state
failures: https://lore.kernel.org/linux-pwm/[email protected]/T/#m9af39aa03bbd9bb7b31b3600f110c65ee0e8e70b
Actually it only relies on patch 01/11 from that.

Cheers,
Andre

 drivers/pwm/pwm-sun4i.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pwm/pwm-sun4i.c +3 -1
index 37d75e252d4e..b973da73e9ab 100644
@@ -118,6 +118,8 @@ static int sun4i_pwm_get_state(struct pwm_chip *chip,
 	unsigned int prescaler;
 
 	clk_rate = clk_get_rate(sun4i_pwm->clk);
+	if (!clk_rate)
+		return -EINVAL;
 
 	val = sun4i_pwm_readl(sun4i_pwm, PWM_CTRL_REG);
 
@@ -142,7 +144,7 @@ static int sun4i_pwm_get_state(struct pwm_chip *chip,
 		prescaler = prescaler_table[PWM_REG_PRESCAL(val, pwm->hwpwm)];
 
 	if (prescaler == 0)
-		return 0;
+		return -EINVAL;
 
 	if (val & BIT_CH(PWM_ACT_STATE, pwm->hwpwm))
 		state->polarity = PWM_POLARITY_NORMAL;
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Andre Przywara

.get_state() can return an error indication now. Make use of it to propagate an impossible prescaler encoding, should that have sneaked in somehow.
Also check the return value of clk_get_rate(). That's unlikely to fail, but we use that in two divide operations down in the code, so let's avoid a divide-by-zero condition on the way.

Quoted 7 lines

---
Hi,

this goes on top of Uwe's series to introduce and observe .get_state
failures: https://lore.kernel.org/linux-pwm/[email protected]/T/#m9af39aa03bbd9bb7b31b3600f110c65ee0e8e70b
Actually it only relies on patch 01/11 from that.

I recommend to put this info in machine-readable form into your patch. If you applied my patch #1 on v6.1-rc1 and this on top, you'd do

	git format-patch -1 --base v6.1-rc1

This results in two additional lines that the build bots can evaluate, to find the right setup to test your patch.

Apart from that:

and thanks to pick up on this topic,
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
#2 lore raw
Quoted 16 lines · On Thu, 1 Dec 2022 16:48:22 +0100 Uwe Kleine-König…
Quoted 7 lines · Andre Przywara

.get_state() can return an error indication now. Make use of it to propagate an impossible prescaler encoding, should that have sneaked in somehow.
Also check the return value of clk_get_rate(). That's unlikely to fail, but we use that in two divide operations down in the code, so let's avoid a divide-by-zero condition on the way.

Quoted 7 lines

---
Hi,

this goes on top of Uwe's series to introduce and observe .get_state
failures: https://lore.kernel.org/linux-pwm/[email protected]/T/#m9af39aa03bbd9bb7b31b3600f110c65ee0e8e70b
Actually it only relies on patch 01/11 from that.

Quoted 7 lines

I recommend to put this info in machine-readable form into your patch. If you applied my patch #1 on v6.1-rc1 and this on top, you'd do

	git format-patch -1 --base v6.1-rc1

This results in two additional lines that the build bots can evaluate, to find the right setup to test your patch.

Ah, nice one, didn't know about that. And just went I wanted to complain that this relies on public branches and committed patches, I learned that it doesn't.

So I got:
base-commit: eb7081409f94a9a8608593d0fb63a1aa3d6f95d8
prerequisite-patch-id: 3022328f2919301d79d852ef148c3f9dc4d723d6

Do you want me to resend the patch with this information?

Quoted 3 lines

Apart from that:

Thanks for that!

Cheers,
Andre

Quoted 4 lines

and thanks to pick up on this topic,
Uwe

maintainer Reviewed-by on v1 1/1
#3 lore raw
In reply to Andre Przywara
Quoted 15 lines · Andre Przywara

.get_state() can return an error indication now. Make use of it to propagate an impossible prescaler encoding, should that have sneaked in somehow.
Also check the return value of clk_get_rate(). That's unlikely to fail, but we use that in two divide operations down in the code, so let's avoid a divide-by-zero condition on the way.

---
Hi,

this goes on top of Uwe's series to introduce and observe .get_state
failures: https://lore.kernel.org/linux-pwm/[email protected]/T/#m9af39aa03bbd9bb7b31b3600f110c65ee0e8e70b
Actually it only relies on patch 01/11 from that.

Quoted 5 lines

Cheers,
Andre

 drivers/pwm/pwm-sun4i.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
maintainer Reviewed-by on v1 1/1
#4 lore raw
In reply to Andre Przywara

Dne četrtek, 01. december 2022 ob 16:22:23 CET je Andre Przywara napisal(a):

Quoted 8 lines

.get_state() can return an error indication now. Make use of it to propagate an impossible prescaler encoding, should that have sneaked in somehow.
Also check the return value of clk_get_rate(). That's unlikely to fail, but we use that in two divide operations down in the code, so let's avoid a divide-by-zero condition on the way.

Best regards,
Jernej