From patchwork Tue Dec 13 07:49:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 87802 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp2072670qgi; Mon, 12 Dec 2016 23:50:15 -0800 (PST) X-Received: by 10.99.212.69 with SMTP id i5mr177063802pgj.29.1481615415540; Mon, 12 Dec 2016 23:50:15 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j190si47064269pgd.278.2016.12.12.23.50.15; Mon, 12 Dec 2016 23:50:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753284AbcLMHuN (ORCPT + 4 others); Tue, 13 Dec 2016 02:50:13 -0500 Received: from mail-pg0-f47.google.com ([74.125.83.47]:35527 "EHLO mail-pg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752597AbcLMHuM (ORCPT ); Tue, 13 Dec 2016 02:50:12 -0500 Received: by mail-pg0-f47.google.com with SMTP id p66so45023897pga.2 for ; Mon, 12 Dec 2016 23:50:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=tM3v69QvfYR//LSkv0Tfgv+OIRPjEUx0seUEcLjwamU=; b=AsD6OrrL18no3n7CplbtbwAgrhzbjBB8oRnW6q8AgX8YDKGHgFyWZyQ7zwU3HS9am9 AliRpEPDS6KF06LmdZhGS0FeM+NRTScynCOfycJAKdWfvJmbQL7VPv2KtM7V9LOj4MO7 5c5K4BoA4oMzaoAZI/ilN8NmVUXcTW0iSiiLw= 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:in-reply-to:references; bh=tM3v69QvfYR//LSkv0Tfgv+OIRPjEUx0seUEcLjwamU=; b=co4rls43V5pe/FqrMWuPG8arC7A4acGWaqEmiiFiHonp6p660EAlWpxiaqKb4oMR0N 0AFQYJjNs9UweXm9Ie2yk/IiNkfPvij9+JQfjdmzQlasR8qc8ePipv8wODiIK41rjVSk saiADqE9jOrZgMV1AfVgseM+3UrLthKnfyJxwVku+MTb40abpRds9rDTk9t1KJd/G5Aq Fgfww+7S/DeI467MTtltzGjfUz2EgcoGJq7pu3vfafrlR6awfbnvW2LgzlmaQoUqsnXg BNDGl7FZ+d86/AH7Us53dPtbA0QVuRxkqMy2/wjJ+F6utiSIhJQfCLoRTR5/U5lNpbGL N2Sg== X-Gm-Message-State: AKaTC02qsmDmRgoJjTFM/2TIPcI515GnYJUwrEv1GF2s/3KpAhrtPbf7vVSIz014/b9GOTKw X-Received: by 10.98.148.26 with SMTP id m26mr98846899pfe.17.1481615411604; Mon, 12 Dec 2016 23:50:11 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id r74sm79157553pfl.79.2016.12.12.23.50.08 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Dec 2016 23:50:11 -0800 (PST) From: Baolin Wang To: mathias.nyman@intel.com, balbi@kernel.org Cc: gregkh@linuxfoundation.org, broonie@kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, baolin.wang@linaro.org Subject: [PATCH v5 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume Date: Tue, 13 Dec 2016 15:49:07 +0800 Message-Id: <65c23bd7ea99c3ebfffd2ded65e32a0446814c38.1481532028.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org For some mobile devices with strict power management, we also want to suspend the host when the slave is detached for power saving. Thus we add the host suspend/resume functions to support this requirement. Signed-off-by: Baolin Wang --- Changes since v4: - Remove Kconfig and just enable host suspend/resume. - Simplify the dwc3_host_suspend/resume() function. Changes since v3: - No updates. Changes since v2: - Remove pm_children_suspended() and other unused macros. Changes since v1: - Add pm_runtime.h head file to avoid kbuild error. --- drivers/usb/dwc3/core.c | 26 +++++++++++++++++++++++++- drivers/usb/dwc3/core.h | 7 +++++++ drivers/usb/dwc3/host.c | 21 +++++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 9a4a5e4..7ad4bc3 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -1091,6 +1091,7 @@ static int dwc3_probe(struct platform_device *pdev) pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, DWC3_DEFAULT_AUTOSUSPEND_DELAY); pm_runtime_enable(dev); + pm_suspend_ignore_children(dev, true); ret = pm_runtime_get_sync(dev); if (ret < 0) goto err1; @@ -1215,15 +1216,27 @@ static int dwc3_remove(struct platform_device *pdev) static int dwc3_suspend_common(struct dwc3 *dwc) { unsigned long flags; + int ret; switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: + spin_lock_irqsave(&dwc->lock, flags); + dwc3_gadget_suspend(dwc); + spin_unlock_irqrestore(&dwc->lock, flags); + break; case USB_DR_MODE_OTG: + ret = dwc3_host_suspend(dwc); + if (ret) + return ret; + spin_lock_irqsave(&dwc->lock, flags); dwc3_gadget_suspend(dwc); spin_unlock_irqrestore(&dwc->lock, flags); break; case USB_DR_MODE_HOST: + ret = dwc3_host_suspend(dwc); + if (ret) + return ret; default: /* do nothing */ break; @@ -1245,12 +1258,23 @@ static int dwc3_resume_common(struct dwc3 *dwc) switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: + spin_lock_irqsave(&dwc->lock, flags); + dwc3_gadget_resume(dwc); + spin_unlock_irqrestore(&dwc->lock, flags); + break; case USB_DR_MODE_OTG: + ret = dwc3_host_resume(dwc); + if (ret) + return ret; + spin_lock_irqsave(&dwc->lock, flags); dwc3_gadget_resume(dwc); spin_unlock_irqrestore(&dwc->lock, flags); - /* FALLTHROUGH */ + break; case USB_DR_MODE_HOST: + ret = dwc3_host_resume(dwc); + if (ret) + return ret; default: /* do nothing */ break; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index b585a30..1099168 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1158,11 +1158,18 @@ static inline bool dwc3_is_usb31(struct dwc3 *dwc) #if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) int dwc3_host_init(struct dwc3 *dwc); void dwc3_host_exit(struct dwc3 *dwc); +int dwc3_host_suspend(struct dwc3 *dwc); +int dwc3_host_resume(struct dwc3 *dwc); #else static inline int dwc3_host_init(struct dwc3 *dwc) { return 0; } static inline void dwc3_host_exit(struct dwc3 *dwc) { } + +static inline int dwc3_host_suspend(struct dwc3 *dwc) +{ return 0; } +static inline int dwc3_host_resume(struct dwc3 *dwc) +{ return 0; } #endif #if IS_ENABLED(CONFIG_USB_DWC3_GADGET) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index ed82464..7959ef0 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -16,6 +16,7 @@ */ #include +#include #include "core.h" @@ -130,3 +131,23 @@ void dwc3_host_exit(struct dwc3 *dwc) dev_name(&dwc->xhci->dev)); platform_device_unregister(dwc->xhci); } + +int dwc3_host_suspend(struct dwc3 *dwc) +{ + struct device *xhci = &dwc->xhci->dev; + + /* + * Note: if we get the -EBUSY, which means the xHCI children devices are + * not in suspend state yet, the glue layer need to wait for a while and + * try to suspend xHCI device again. + */ + return pm_runtime_put_sync(xhci); +} + +int dwc3_host_resume(struct dwc3 *dwc) +{ + struct device *xhci = &dwc->xhci->dev; + + /* Resume the xHCI device synchronously. */ + return pm_runtime_get_sync(xhci); +}