usb: host: ehci-sched: try to turn on io watchdog as long as periodic_count > 0
Subsystems (2)
PATCH 1/1 usb: host: ehci-sched: try to turn on io watchdog as long as periodic_count > 0
If initially isoc_count = 0, periodic_count > 0 and the io watchdog is not started (e.g. just timed out), then the io watchdog may not run after submitting isoc urbs and enable_periodic(). The isoc urbs may not complete forever if the controller had already stopped periodic schedule.
This will try to call turn_on_io_watchdog() for each enable_periodic() to ensure the io watchdog functions properly.
--- drivers/usb/host/ehci-sched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/ehci-sched.c +2 -1
@@ -490,13 +490,14 @@ static int tt_no_collision(static void enable_periodic (struct ehci_hcd *ehci) {if (ehci->periodic_count++) -return ; + goto out;/* Stop waiting to turn off the periodic schedule */ ehci->enabled_hrtimer_events &= ~BIT (EHCI_HRTIMER_DISABLE_PERIODIC );/* Don't start the schedule until PSS is 0 */ ehci_poll_PSS (ehci); +out:turn_on_io_watchdog (ehci); }
Signature · 1 line
2.34.1
Quoted 22 lines · Xu Yang
If initially
isoc_count= 0,periodic_count> 0 and the io watchdog is not started (e.g. just timed out), then the io watchdog may not run after submitting isoc urbs andenable_periodic(). The isoc urbs may not complete forever if the controller had already stopped periodic schedule.This will try to call
turn_on_io_watchdog()for eachenable_periodic()to ensure the io watchdog functions properly.Signed-off-by Xu Yang <[email protected]>--- drivers/usb/host/ehci-sched.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/usb/host/ehci-sched.c +0
-1@@ -490,13 +490,14 @@ static int tt_no_collision(static void enable_periodic (struct ehci_hcd *ehci) {if (ehci->periodic_count++) -return ;
drivers/usb/host/ehci-sched.c static int tt_no_collision( · line 502
Quoted 10 lines
drivers/usb/host/ehci-sched.c +2
-0+ goto out;/* Stop waiting to turn off the periodic schedule */ ehci->enabled_hrtimer_events &= ~BIT (EHCI_HRTIMER_DISABLE_PERIODIC );/* Don't start the schedule until PSS is 0 */ ehci_poll_PSS (ehci); +out:turn_on_io_watchdog (ehci); }