FAILED: patch "[PATCH] usb: host: ehci: use new USB_RESUME_TIMEOUT" failed to apply to 3.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 3.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
ea16328f80ca8d74434352157f37ef60e2f55ce2Mon Sep 17 00:00:00 2001
From: Felipe Balbi <[email protected]>
Date: Fri, 13 Feb 2015 14:42:25 -0600
Subject: [PATCH] usb: host: ehci: use new USB_RESUME_TIMEOUT
Make sure we're using the new macro, so our
resume signaling will always pass certification.
Cc <[email protected]> # v3.10+
Signed-off-by Felipe Balbi <[email protected]>
drivers/usb/host/ehci-hcd.c +5 -5
@@ -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
@@ -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 ;