| Message ID | 20210811061053.32081-1-tony@atomide.com |
|---|---|
| State | New |
| Headers | show |
| Series | bus: ti-sysc: Fix error handling for sysc_check_active_timer() | expand |
Hi On 8/11/21 9:22 AM, Pavel Machek wrote: > On Wed 2021-08-11 09:10:53, Tony Lindgren wrote: >> 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 <pavel@denx.de>. >> >> 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 <pavel@denx.de>. >> >> 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") >> Reported-by: Pavel Machek <pavel@denx.de> >> Cc: Grygorii Strashko <grygorii.strashko@ti.com> >> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> >> Signed-off-by: Tony Lindgren <tony@atomide.com> > > Reviewed-by: Pavel Machek (CIP) <pavel@denx.de> > 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, Tested-by: jarkko.nikula@bitmer.com
* Jarkko Nikula <jarkko.nikula@bitmer.com> [210815 18:13]: > 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, > > Tested-by: jarkko.nikula@bitmer.com 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
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -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)
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 <pavel@denx.de>. 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 <pavel@denx.de>. 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") Reported-by: Pavel Machek <pavel@denx.de> Cc: Grygorii Strashko <grygorii.strashko@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/bus/ti-sysc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)