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

Commit eb71647b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: xhci: Ensure 10 msec delay between bus states"

parents 75ca3762 68d796a5

drivers/usb/host/xhci-hub.c

+5 −2
Original line number Diff line number Diff line
@@ -1306,6 +1306,9 @@ int xhci_bus_suspend(struct usb_hcd *hcd) 
	max_ports = xhci_get_ports(hcd, &port_array);

	bus_state = &xhci->bus_state[hcd_index(hcd)];



	if (time_before_eq(jiffies, bus_state->next_statechange))

		usleep_range(10000, 11000);



	spin_lock_irqsave(&xhci->lock, flags);



	if (hcd->self.root_hub->do_remote_wakeup) {
@@ -1398,8 +1401,8 @@ int xhci_bus_resume(struct usb_hcd *hcd) 
	max_ports = xhci_get_ports(hcd, &port_array);

	bus_state = &xhci->bus_state[hcd_index(hcd)];



	if (time_before(jiffies, bus_state->next_statechange))

		msleep(5);

	if (time_before_eq(jiffies, bus_state->next_statechange))

		usleep_range(10000, 11000);



	spin_lock_irqsave(&xhci->lock, flags);

	if (!HCD_HW_ACCESSIBLE(hcd)) {

drivers/usb/host/xhci-msm-hsic.c

+5 −0
Original line number Diff line number Diff line
@@ -646,11 +646,16 @@ static int mxhci_hsic_bus_resume(struct usb_hcd *hcd) 
{

	int ret;

	struct mxhci_hsic_hcd *mxhci = hcd_to_hsic(hcd->primary_hcd);

	struct xhci_bus_state *bus_state;



	if (!usb_hcd_is_primary_hcd(hcd))

		return 0;



	if (mxhci->resume_gpio) {

		bus_state = &mxhci->xhci->bus_state[hcd_index(hcd)];

		if (time_before_eq(jiffies, bus_state->next_statechange))

			usleep_range(10000, 11000);



		xhci_dbg_log_event(&dbg_hsic, NULL, "resume gpio high",

				readl_relaxed(MSM_HSIC_PORTSC));

		gpio_direction_output(mxhci->resume_gpio, 1);