Oops, nope, I had to drop this from the stable queues, as it breaks the build. Can you provide a backport if you think it is necessary for the stable kernels? thanks, greg k-h On Tue, May 23, 2017 at 02:40:42PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > This is a note to let you know that I've just added the patch titled > > usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume > > to the 4.11-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-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch > and it can be found in the queue-4.11 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > >From d4d75128b8fd727d42c775a16b41634d09409dba Mon Sep 17 00:00:00 2001 > From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx> > Date: Tue, 21 Feb 2017 19:59:48 +0900 > Subject: usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume > > From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx> > > commit d4d75128b8fd727d42c775a16b41634d09409dba upstream. > > This patch fixes an issue that a usb 1.1 device is not connected in > system resume and then the following message appeared if debug messages > are enabled: > usb 2-1: Waited 2000ms for CONNECT > > To resolve this issue, the EHCI controller must be resumed after its > companion controllers. So, this patch adds such code on the driver. > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > drivers/usb/host/ehci-platform.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > --- a/drivers/usb/host/ehci-platform.c > +++ b/drivers/usb/host/ehci-platform.c > @@ -34,6 +34,7 @@ > #include <linux/usb.h> > #include <linux/usb/hcd.h> > #include <linux/usb/ehci_pdriver.h> > +#include <linux/usb/of.h> > > #include "ehci.h" > > @@ -297,6 +298,7 @@ static int ehci_platform_probe(struct pl > goto err_power; > > device_wakeup_enable(hcd->self.controller); > + device_enable_async_suspend(hcd->self.controller); > platform_set_drvdata(dev, hcd); > > return err; > @@ -370,6 +372,7 @@ static int ehci_platform_resume(struct d > struct usb_ehci_pdata *pdata = dev_get_platdata(dev); > struct platform_device *pdev = to_platform_device(dev); > struct ehci_platform_priv *priv = hcd_to_ehci_priv(hcd); > + struct device *companion_dev; > > if (pdata->power_on) { > int err = pdata->power_on(pdev); > @@ -377,6 +380,10 @@ static int ehci_platform_resume(struct d > return err; > } > > + companion_dev = usb_of_get_companion_dev(hcd->self.controller); > + if (companion_dev) > + device_pm_wait_for_dev(hcd->self.controller, companion_dev); > + > ehci_resume(hcd, priv->reset_on_resume); > return 0; > } > > > Patches currently in stable-queue which might be from yoshihiro.shimoda.uh@xxxxxxxxxxx are > > queue-4.11/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch > queue-4.11/usb-ehci-platform-fix-companion-device-leak.patch