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

Commit c8d1bc12 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-for-v4.1-part2' of... 

Merge tag 'usb-for-v4.1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-testing

Felipe writes:

usb: generic resume timeout for v4.1

This part 2 pull request contains only the patches
which make sure everybody on linux uses the same
resume timeout value.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parents b7a4abb6 bbc78c07

drivers/usb/core/hub.c

+2 −2
Original line number Diff line number Diff line
@@ -3406,10 +3406,10 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg) 
	if (status) {

		dev_dbg(&port_dev->dev, "can't resume, status %d\n", status);

	} else {

		/* drive resume for at least 20 msec */

		/* drive resume for USB_RESUME_TIMEOUT msec */

		dev_dbg(&udev->dev, "usb %sresume\n",

				(PMSG_IS_AUTO(msg) ? "auto-" : ""));

		msleep(25);

		msleep(USB_RESUME_TIMEOUT);



		/* Virtual root hubs can trigger on GET_PORT_STATUS to

		 * stop resume signaling.  Then finish the resume

drivers/usb/dwc2/hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -1529,7 +1529,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq, 
			dev_dbg(hsotg->dev,

				"ClearPortFeature USB_PORT_FEAT_SUSPEND\n");

			writel(0, hsotg->regs + PCGCTL);

			usleep_range(20000, 40000);

			msleep(USB_RESUME_TIMEOUT);



			hprt0 = dwc2_read_hprt0(hsotg);

			hprt0 |= HPRT0_RES;

drivers/usb/host/ehci-hcd.c

+5 −5
Original line number Diff line number Diff line
@@ -792,12 +792,12 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd) 
					ehci->reset_done[i] == 0))

				continue;



			/* start 20 msec resume signaling from this port,

			 * and make hub_wq collect PORT_STAT_C_SUSPEND to

			 * stop that signaling.  Use 5 ms extra for safety,

			 * like usb_port_resume() does.

			/* start USB_RESUME_TIMEOUT msec resume signaling from

			 * this port, and make hub_wq collect

			 * PORT_STAT_C_SUSPEND to stop that signaling.

			 */

			ehci->reset_done[i] = jiffies + msecs_to_jiffies(25);

			ehci->reset_done[i] = jiffies +

				msecs_to_jiffies(USB_RESUME_TIMEOUT);

			set_bit(i, &ehci->resuming_ports);

			ehci_dbg (ehci, "port %d remote wakeup\n", i + 1);

			usb_hcd_start_port_resume(&hcd->self, i);

drivers/usb/host/ehci-hub.c

+6 −3
Original line number Diff line number Diff line
@@ -471,10 +471,13 @@ static int ehci_bus_resume (struct usb_hcd *hcd) 
		ehci_writel(ehci, temp, &ehci->regs->port_status [i]);

	}



	/* msleep for 20ms only if code is trying to resume port */

	/*

	 * msleep for USB_RESUME_TIMEOUT ms only if code is trying to resume

	 * port

	 */

	if (resume_needed) {

		spin_unlock_irq(&ehci->lock);

		msleep(20);

		msleep(USB_RESUME_TIMEOUT);

		spin_lock_irq(&ehci->lock);

		if (ehci->shutdown)

			goto shutdown;
@@ -942,7 +945,7 @@ int ehci_hub_control( 
			temp &= ~PORT_WAKE_BITS;

			ehci_writel(ehci, temp | PORT_RESUME, status_reg);

			ehci->reset_done[wIndex] = jiffies

					+ msecs_to_jiffies(20);

					+ msecs_to_jiffies(USB_RESUME_TIMEOUT);

			set_bit(wIndex, &ehci->resuming_ports);

			usb_hcd_start_port_resume(&hcd->self, wIndex);

			break;

drivers/usb/host/fotg210-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ static int fotg210_hub_control( 
			/* resume signaling for 20 msec */

			fotg210_writel(fotg210, temp | PORT_RESUME, status_reg);

			fotg210->reset_done[wIndex] = jiffies

					+ msecs_to_jiffies(20);

					+ msecs_to_jiffies(USB_RESUME_TIMEOUT);

			break;

		case USB_PORT_FEAT_C_SUSPEND:

			clear_bit(wIndex, &fotg210->port_c_suspend);