From patchwork Wed Jul 12 03:52:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gustavo panizzo X-Patchwork-Id: 107440 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp309468qge; Tue, 11 Jul 2017 21:00:14 -0700 (PDT) X-Received: by 10.99.137.66 with SMTP id v63mr1791948pgd.182.1499832014552; Tue, 11 Jul 2017 21:00:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499832014; cv=none; d=google.com; s=arc-20160816; b=migxqPLU4/1hrX06caW37aHq61l3MxdhbUwPAX5Z/9HX0aeM2uPwPy3Q0ldohbm5B1 zNPuPnRNezLrNdZI2fteSyIGLBUvJfBGyl4hh72rpf7uZeIGp0KmBQ3LSYaNhLXguSJO vwNB8BeDpRr/8ZEmdqq/HJUNb/B6zbVNCxIZ3UytvlXKpzJBNrmclDRL/evyhMP5FK5W /dEW2x575EA9OHz2uCnlEFVcR44sQL8velCRH+Ydf03X0JxG+Qz83Ql1gBBVPqRdkKGm VQHHqd/2EA5Z2K+MpVYyoTkjKFDyrpYFWwRktLvPtPYc0KDjQFlaFRTTFlawvfnZPaNP SZ9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=497WOuJ3Asx8gmvmZNdcL55M18Oyek5ii3zd3Ot4XoM=; b=JmCF3FaNi83dhO35omfDfgrYDmjnn/2PdU5D5y0JtnxdzHFR6ixgNPRZJE/DFtfpla vQlJeGkFmY0FeLI2PtKNcFw1C2qcrG84ah04srfh/2yoQOffFwYwfDAnHf/fwQ5ZUNqh IELPNmPbhLi33dZleCrzC7SEayFwVuXWZAxdOPuIEiWcQbHPBZwErhdPVpnMbeiUoH4+ 1/7TOHj6Q8ODcG0x0NVvF2DO6w4VgYllwgWR8wlX9FMZIQiSEUY+A278NfsooRy201pY 9mDfRfCqqvpbkXC/Qa3SmKH8JUbyJ3y7V0ZvFuIzYjMMt7cjkqXsb39DwtrwC9AflrEw +TtQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=REJECT dis=NONE) header.from=zumbi.com.ar Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t22si980665pfi.144.2017.07.11.21.00.14; Tue, 11 Jul 2017 21:00:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=REJECT dis=NONE) header.from=zumbi.com.ar Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750705AbdGLEAM (ORCPT + 6 others); Wed, 12 Jul 2017 00:00:12 -0400 Received: from tk.zumbi.com.ar ([106.185.28.14]:45402 "EHLO tk.zumbi.com.ar" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750703AbdGLEAL (ORCPT ); Wed, 12 Jul 2017 00:00:11 -0400 X-Greylist: delayed 429 seconds by postgrey-1.27 at vger.kernel.org; Wed, 12 Jul 2017 00:00:10 EDT Received: from zumbi.com.ar (unknown [IPv6:2404:c804:e00:c100:6e88:14ff:fe2f:d9ac]) by tk.zumbi.com.ar (Postfix) with ESMTPS id 3x6lRh5Gr4z2j; Wed, 12 Jul 2017 03:53:36 +0000 (UTC) Received: (nullmailer pid 27636 invoked by uid 2000); Wed, 12 Jul 2017 03:52:56 -0000 From: gustavo panizzo To: balbi@kernel.org Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, gustavo panizzo , Brian Kim Subject: [PATCH] usb: dwc3: Fix the USB 3.0 hub detection bug after warm boot Date: Wed, 12 Jul 2017 11:52:38 +0800 Message-Id: <20170712035238.27554-1-gfa@zumbi.com.ar> X-Mailer: git-send-email 2.11.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The dwc3 could not release resources when the module is built-in because this module does not have shutdown method. This causes the USB 3.0 hub is not able to detect after warm boot. Original patch by Brian Kim, updated and submitted upstream by gustavo panizzo. Also see https://bugs.debian.org/843448 Signed-off-by: Brian Kim Signed-off-by: gustavo panizzo --- drivers/usb/dwc3/core.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) -- 2.11.0 diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 326b302fc440..f92dfe213d89 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1259,6 +1259,38 @@ static int dwc3_probe(struct platform_device *pdev) return ret; } +static void dwc3_shutdown(struct platform_device *pdev) +{ + struct dwc3 *dwc = platform_get_drvdata(pdev); + struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + pm_runtime_get_sync(&pdev->dev); + /* + * restore res->start back to its original value so that, in case the + * probe is deferred, we don't end up getting error in request the + * memory region the next time probe is called. + */ + res->start -= DWC3_GLOBALS_REGS_START; + + dwc3_debugfs_exit(dwc); + dwc3_core_exit_mode(dwc); + dwc3_event_buffers_cleanup(dwc); + dwc3_free_event_buffers(dwc); + + usb_phy_set_suspend(dwc->usb2_phy, 1); + usb_phy_set_suspend(dwc->usb3_phy, 1); + + phy_power_off(dwc->usb2_generic_phy); + phy_power_off(dwc->usb3_generic_phy); + + dwc3_core_exit(dwc); + dwc3_ulpi_exit(dwc); + + pm_runtime_put_sync(&pdev->dev); + pm_runtime_allow(&pdev->dev); + pm_runtime_disable(&pdev->dev); +} + static int dwc3_remove(struct platform_device *pdev) { struct dwc3 *dwc = platform_get_drvdata(pdev); @@ -1488,6 +1520,7 @@ MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match); static struct platform_driver dwc3_driver = { .probe = dwc3_probe, .remove = dwc3_remove, + .shutdown = dwc3_shutdown, .driver = { .name = "dwc3", .of_match_table = of_match_ptr(of_dwc3_match),