From 6c10d1142ad073622d338f20aa2e44b2d41927ce Mon Sep 17 00:00:00 2001 From: Jonathan Bell Date: Wed, 7 Oct 2020 15:09:29 +0100 Subject: [PATCH] dwc_otg: initialise sched_frame for periodic QHs that were parked If a periodic QH has no remaining QTDs, then it is removed from all periodic schedules. When re-adding, initialise the sched_frame and start_split_frame from the current value of the frame counter. See https://bugs.launchpad.net/raspbian/+bug/1819560 and https://github.com/raspberrypi/linux/issues/3883 Signed-off-by: Jonathan Bell --- drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c @@ -689,7 +689,11 @@ int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * h &qh->qh_list_entry); //hcd->fiq_state->kick_np_queues = 1; } else { + /* If the QH wasn't in a schedule, then sched_frame is stale. */ + qh->sched_frame = dwc_frame_num_inc(dwc_otg_hcd_get_frame_number(hcd), + SCHEDULE_SLOP); status = schedule_periodic(hcd, qh); + qh->start_split_frame = qh->sched_frame; if ( !hcd->periodic_qh_count ) { intr_mask.b.sofintr = 1; if (fiq_enable) {