From patchwork Mon Jul 6 18:27:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 6727111 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E1D659F38C for ; Mon, 6 Jul 2015 18:28:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DDB0F202F0 for ; Mon, 6 Jul 2015 18:28:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DA5B020225 for ; Mon, 6 Jul 2015 18:28:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZCB7Z-0005fJ-L5; Mon, 06 Jul 2015 18:28:01 +0000 Received: from mail-ig0-x22c.google.com ([2607:f8b0:4001:c05::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZCB7X-0005ba-KK for linux-rockchip@lists.infradead.org; Mon, 06 Jul 2015 18:28:00 +0000 Received: by igcsj18 with SMTP id sj18so241621667igc.1 for ; Mon, 06 Jul 2015 11:27:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6GFE/Ex2ZSAt2KtJrkVkgnFaIEL1GK4sG5fvtsyndjM=; b=fF9mTAm+/0sZ+8GjYxe7oIrrsKfGsSxrppWiTnv4dBJ+uB8IcM+TL7zAHJhHTMfWxU LHXqWQJlwqSE/Ns8bCeHJoMiADe9SuEMv8KYo371YSpDcJIfsp/moBoNXVKP+q8DdXnH BGidnL9B5tJJPzt9wrO/Lah+YK+x5jVwcthRM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6GFE/Ex2ZSAt2KtJrkVkgnFaIEL1GK4sG5fvtsyndjM=; b=g9H3GclKGplyuujpcm9dpW+ECmhAFoesE2jaMgHg4cFeI+gm/mf7mJo5+CzDJQ7CxP pFw6PGDqPftQi/jwod9F3eDlgk9gxsvEpAwGYMs+e9rdYZ5MgWolQfJ2v6byWDEWkBGe wVKDxXobO7XlmWZbPritvX0MfsMQ6W/FQCOnXFMpXXP+iEWc6ockr8nwAc4tPKF/qXPl JmKTgnA84BTPuea8vIUlZa1r2x5I3PSFCwwMsTc6K3IDjbdQI+a47oi2LVPLYd3cJXtj NZlFN3MOhIgBW2NbS7i1J9n5RQfDScYL4cK4t5Vehqp9xLA0HKvkYrF+xjXebxpQ+2Op XjBA== X-Gm-Message-State: ALoCoQlNikTRB0S+xhmunHkDeI84J8irNpgdhf+P3ZkmFwITjpDLp5l4ERhSwhhAhguNiO8tGTP/ X-Received: by 10.50.142.9 with SMTP id rs9mr42742965igb.17.1436207258784; Mon, 06 Jul 2015 11:27:38 -0700 (PDT) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by smtp.gmail.com with ESMTPSA id o19sm10174850igi.14.2015.07.06.11.27.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Jul 2015 11:27:38 -0700 (PDT) From: Douglas Anderson To: Greg Kroah-Hartman , John Youn , Felipe Balbi Subject: [REPOST PATCH 3/3] USB: dwc2: Don't turn off the usbphy in suspend if wakeup is enabled Date: Mon, 6 Jul 2015 11:27:04 -0700 Message-Id: <1436207224-21849-4-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.4.3.573.g4eafbef In-Reply-To: <1436207224-21849-1-git-send-email-dianders@chromium.org> References: <1436207224-21849-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150706_112759_712475_7363985C X-CRM114-Status: GOOD ( 18.56 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heiko Stuebner , Andrew Bresticker , linux-usb@vger.kernel.org, Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, lyz@rock-chips.com, Chris Zhong , Julius Werner , Alexandru Stan MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the 'snps,need-phy-for-wake' is set in the device tree then: - We know that we can wakeup, so call device_set_wakeup_capable(). The USB core will use this knowledge to enable wakeup by default. - We know that we should keep the PHY on during suspend if something on our root hub needs remote wakeup. This requires the patch (USB: Export usb_wakeup_enabled_descendants()). Note that we don't keep the PHY on at suspend time if it's not needed because it would be a power draw. If we later find some users of dwc2 that can support wakeup without keeping the PHY on we may want to add a way to call device_set_wakeup_capable() without keeping the PHY on at suspend time. Signed-off-by: Chris Zhong Signed-off-by: Douglas Anderson --- drivers/usb/dwc2/core.h | 2 ++ drivers/usb/dwc2/platform.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h index 53b8de0..b60a1e8 100644 --- a/drivers/usb/dwc2/core.h +++ b/drivers/usb/dwc2/core.h @@ -687,6 +687,8 @@ struct dwc2_hsotg { enum usb_dr_mode dr_mode; unsigned int hcd_enabled:1; unsigned int gadget_enabled:1; + unsigned int need_phy_for_wake:1; + unsigned int phy_off_for_suspend:1; struct phy *phy; struct usb_phy *uphy; diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index 9093530..38fce75 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -42,7 +42,9 @@ #include #include #include +#include +#include #include #include "core.h" @@ -222,6 +224,10 @@ static int dwc2_driver_probe(struct platform_device *dev) hsotg->dr_mode = of_usb_get_dr_mode(dev->dev.of_node); + hsotg->need_phy_for_wake = + of_property_read_bool(dev->dev.of_node, + "snps,need-phy-for-wake"); + /* * Attempt to find a generic PHY, then look for an old style * USB PHY @@ -265,6 +271,14 @@ static int dwc2_driver_probe(struct platform_device *dev) hsotg->gadget_enabled = 1; } + /* + * If we need PHY for wakeup we must be wakeup capable. + * When we have a device that can wake without the PHY we + * can adjust this condition. + */ + if (hsotg->need_phy_for_wake) + device_set_wakeup_capable(&dev->dev, true); + if (hsotg->dr_mode != USB_DR_MODE_PERIPHERAL) { retval = dwc2_hcd_init(hsotg, irq); if (retval) { @@ -282,6 +296,28 @@ static int dwc2_driver_probe(struct platform_device *dev) return retval; } +static bool __maybe_unused dwc2_can_poweroff_phy(struct dwc2_hsotg *dwc2) +{ + struct usb_device *root_hub = dwc2_hsotg_to_hcd(dwc2)->self.root_hub; + + if (dwc2->lx_state == DWC2_L0) + return false; + + /* If the controller isn't allowed to wakeup then we can power off. */ + if (!device_may_wakeup(dwc2->dev)) + return true; + + /* + * We don't want to power off the PHY if something under the + * root hub has wakeup enabled. + */ + if (usb_wakeup_enabled_descendants(root_hub)) + return false; + + /* No reason to keep the PHY powered, so allow poweroff */ + return true; +} + static int __maybe_unused dwc2_suspend(struct device *dev) { struct dwc2_hsotg *dwc2 = dev_get_drvdata(dev); @@ -290,8 +326,10 @@ static int __maybe_unused dwc2_suspend(struct device *dev) if (dwc2_is_device_mode(dwc2)) { ret = s3c_hsotg_suspend(dwc2); } else { - if (dwc2->lx_state == DWC2_L0) + if (!dwc2_can_poweroff_phy(dwc2)) return 0; + + dwc2->phy_off_for_suspend = true; phy_exit(dwc2->phy); phy_power_off(dwc2->phy); @@ -307,9 +345,12 @@ static int __maybe_unused dwc2_resume(struct device *dev) if (dwc2_is_device_mode(dwc2)) { ret = s3c_hsotg_resume(dwc2); } else { + if (!dwc2->phy_off_for_suspend) + return ret; + phy_power_on(dwc2->phy); phy_init(dwc2->phy); - + dwc2->phy_off_for_suspend = false; } return ret; }