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

Commit 73554d82 authored by Mathias Nyman's avatar Mathias Nyman Committed by Sasha Levin
Browse files

xhci: resume USB 3 roothub first 



[ Upstream commit 671ffdff5b13314b1fc65d62cf7604b873fb5dc4 ]

Give USB3 devices a better chance to enumerate at USB 3 speeds if
they are connected to a suspended host.
Solves an issue with NEC uPD720200 host hanging when partially
enumerating a USB3 device as USB2 after host controller runtime resume.

Cc: <stable@vger.kernel.org>
Tested-by: default avatarMike Murdoch <main.haarp@gmail.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 4b76bb49

drivers/usb/host/xhci.c

+3 −3
Original line number Diff line number Diff line
@@ -1102,8 +1102,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) 
		/* Resume root hubs only when have pending events. */

		status = readl(&xhci->op_regs->status);

		if (status & STS_EINT) {

			usb_hcd_resume_root_hub(hcd);

			usb_hcd_resume_root_hub(xhci->shared_hcd);

			usb_hcd_resume_root_hub(hcd);

		}

	}
@@ -1118,10 +1118,10 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) 


	/* Re-enable port polling. */

	xhci_dbg(xhci, "%s: starting port polling.\n", __func__);

	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	usb_hcd_poll_rh_status(hcd);

	set_bit(HCD_FLAG_POLL_RH, &xhci->shared_hcd->flags);

	usb_hcd_poll_rh_status(xhci->shared_hcd);

	set_bit(HCD_FLAG_POLL_RH, &hcd->flags);

	usb_hcd_poll_rh_status(hcd);



	return retval;

}