Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08c4ffc2 authored by Gregory Herrero's avatar Gregory Herrero Committed by Felipe Balbi
Browse files

usb: dwc2: host: reset frame number after suspend 



Frame number is reset in hardware after exiting hibernation.
Thus, reset frame_number and ensure qh are queued with correct
sched_frame.

Otherwise, qh->sched_frame may be too high compared to
current frame number (which is 0). This can delay addition of qh in
the list of transfers until frame number reaches qh->sched_frame.

Signed-off-by: default avatarGregory Herrero <gregory.herrero@intel.com>
Signed-off-by: default avatarMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Tested-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Tested-by: default avatarDinh Nguyen <dinguyen@opensource.altera.com>
Tested-by: default avatarJohn Youn <johnyoun@synopsys.com>
Acked-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent bea78555

drivers/usb/dwc2/core.c

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ static int dwc2_restore_host_registers(struct dwc2_hsotg *hsotg) 


	dwc2_writel(hr->hprt0, hsotg->regs + HPRT0);

	dwc2_writel(hr->hfir, hsotg->regs + HFIR);

	hsotg->frame_number = 0;



	return 0;

}

drivers/usb/dwc2/hcd_queue.c

+8 −0
Original line number Diff line number Diff line
@@ -583,6 +583,14 @@ int dwc2_hcd_qh_add(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh) 
		/* QH already in a schedule */

		return 0;



	if (!dwc2_frame_num_le(qh->sched_frame, hsotg->frame_number) &&

			!hsotg->frame_number) {

		dev_dbg(hsotg->dev,

				"reset frame number counter\n");

		qh->sched_frame = dwc2_frame_num_inc(hsotg->frame_number,

				SCHEDULE_SLOP);

	}



	/* Add the new QH to the appropriate schedule */

	if (dwc2_qh_is_non_per(qh)) {

		/* Always start in inactive schedule */