From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:50408 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757593AbdEWMot (ORCPT ); Tue, 23 May 2017 08:44:49 -0400 Subject: Patch "usb: host: ehci-platform: fix usb 1.1 device is not connected in system resume" has been added to the 4.9-stable tree To: yoshihiro.shimoda.uh@renesas.com, gregkh@linuxfoundation.org Cc: , From: Date: Tue, 23 May 2017 14:43:03 +0200 Message-ID: <1495543383168182@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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.9-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.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From d4d75128b8fd727d42c775a16b41634d09409dba Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda 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 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 Signed-off-by: Greg Kroah-Hartman --- 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 #include #include +#include #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@renesas.com are queue-4.9/usb-host-ehci-platform-fix-usb-1.1-device-is-not-connected-in-system-resume.patch queue-4.9/usb-ehci-platform-fix-companion-device-leak.patch