Patch "usb: host: ehci: use new USB_RESUME_TIMEOUT" has been added to the 3.19-stable tree

This is a note to let you know that I've just added the patch titled

usb: host: ehci: use new USB_RESUME_TIMEOUT

to the 3.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-host-ehci-use-new-usb_resume_timeout.patch
and it can be found in the queue-3.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Felipe Balbi <[email protected]>
Date: Fri, 13 Feb 2015 14:42:25 -0600
Subject: usb: host: ehci: use new USB_RESUME_TIMEOUT

From: Felipe Balbi <[email protected]>

commit ea16328f80ca8d74434352157f37ef60e2f55ce2 upstream.

Make sure we're using the new macro, so our
resume signaling will always pass certification.

---
 drivers/usb/host/ehci-hcd.c |   10 +++++-----
 drivers/usb/host/ehci-hub.c |    9 ++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

@@ -792,12 +792,12 @@ static irqreturn_t ehci_irq (struct usb_
 					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);

@@ -471,10 +471,13 @@ static int ehci_bus_resume (struct usb_h
 		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;

Patches currently in stable-queue which might be from [email protected] are

queue-3.19/usb-host-xhci-use-new-usb_resume_timeout.patch queue-3.19/usb-host-sl811-use-new-usb_resume_timeout.patch queue-3.19/usb-musb-use-new-usb_resume_timeout.patch queue-3.19/usb-define-a-generic-usb_resume_timeout-macro.patch queue-3.19/usb-host-oxu210hp-use-new-usb_resume_timeout.patch queue-3.19/usb-host-isp116x-use-new-usb_resume_timeout.patch queue-3.19/usb-host-r8a66597-use-new-usb_resume_timeout.patch queue-3.19/usb-musb-core-fix-tx-rx-endpoint-order.patch queue-3.19/usb-core-hub-use-new-usb_resume_timeout.patch queue-3.19/usb-host-fusbh200-use-new-usb_resume_timeout.patch queue-3.19/usb-gadget-printer-enqueue-printer-s-response-for-setup-request.patch queue-3.19/usb-host-ehci-use-new-usb_resume_timeout.patch queue-3.19/usb-host-uhci-use-new-usb_resume_timeout.patch queue-3.19/usb-host-fotg210-use-new-usb_resume_timeout.patch queue-3.19/usb-phy-find-the-right-match-in-devm_usb_phy_match.patch