Skip to contentSkip to conversation

bus: ti-sysc: Fix error handling for sysc_check_active_timer()

PATCH In review Tony Lindgren 3 participants 4 messages Aug 11, 2021 – Aug 19, 2021 OMAP2+ support

lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

PATCH 1/1 bus: ti-sysc: Fix error handling for sysc_check_active_timer()

We have changed the return type for sysc_check_active_timer() from -EBUSY to -ENXIO, but the gpt12 system timer fix still checks for -EBUSY. We are also not returning on other errors like we did earlier as noted by Pavel Machek <[email protected]>.

Commit 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status") should have been updated for commit 65fb73676112 ("bus: ti-sysc: suppress err msg for timers used as clockevent/source").

Let's fix the issue by checking for -ENXIO and returning on any other errors as suggested by Pavel Machek <[email protected]>.

Fixes 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status")

Depends-on: 65fb73676112 ("bus: ti-sysc: suppress err msg for timers used as clockevent/source")

---
 drivers/bus/ti-sysc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/bus/ti-sysc.c +3 -1
@@ -3097,8 +3097,10 @@ static int sysc_probe(struct platform_device *pdev)
 		return error;
 
 	error = sysc_check_active_timer(ddata);
-	if (error == -EBUSY)
+	if (error == -ENXIO)
 		ddata->reserved = true;
+	else if (error)
+		return error;
 
 	error = sysc_get_clocks(ddata);
 	if (error)
Signature · 1 line
2.32.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 12 lines · Tony Lindgren

We have changed the return type for sysc_check_active_timer() from -EBUSY to -ENXIO, but the gpt12 system timer fix still checks for -EBUSY. We are also not returning on other errors like we did earlier as noted by Pavel Machek <[email protected]>.

Commit 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status") should have been updated for commit 65fb73676112 ("bus: ti-sysc: suppress err msg for timers used as clockevent/source").

Let's fix the issue by checking for -ENXIO and returning on any other errors as suggested by Pavel Machek <[email protected]>.

Quoted 6 lines
Fixes 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status")

Depends-on: 65fb73676112 ("bus: ti-sysc: suppress err msg for timers used as clockevent/source")

Best regards,
Pavel

Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Tested-by
#2 lore raw

Hi

Quoted 13 lines · Pavel Machek
Quoted 12 lines · Tony Lindgren

We have changed the return type for sysc_check_active_timer() from -EBUSY to -ENXIO, but the gpt12 system timer fix still checks for -EBUSY. We are also not returning on other errors like we did earlier as noted by Pavel Machek <[email protected]>.

Commit 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status") should have been updated for commit 65fb73676112 ("bus: ti-sysc: suppress err msg for timers used as clockevent/source").

Let's fix the issue by checking for -ENXIO and returning on any other errors as suggested by Pavel Machek <[email protected]>.

Quoted 9 lines
Quoted 6 lines
Fixes 3ff340e24c9d ("bus: ti-sysc: Fix gpt12 system timer issue with reserved status")

Depends-on: 65fb73676112 ("bus: ti-sysc: suppress err msg for timers used as clockevent/source")

I double checked but actually both plain 0aa78d17099b ("Merge tag 'scsi-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") and with this patch boot fine on my Beagle C2.

Anyway,

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer
#3 lore raw
Quoted 8 lines · Jarkko Nikula

I double checked but actually both plain 0aa78d17099b ("Merge tag 'scsi-fixes' of
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") and with this patch boot fine on my Beagle C2.

Anyway,

OK thanks for testing. I had already pushed out my fixes branch so I did not want to go back to add the Tested-by. Anyways, a pull request for this has been sent now.

Regards,

Tony