From patchwork Wed Nov 23 12:24:23 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: 83644 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp2607399qge; Wed, 23 Nov 2016 04:25:39 -0800 (PST) X-Received: by 10.98.155.146 with SMTP id e18mr2588956pfk.45.1479903939044; Wed, 23 Nov 2016 04:25:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g19si33538368pfa.167.2016.11.23.04.25.38; Wed, 23 Nov 2016 04:25:39 -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 S935862AbcKWMZa (ORCPT + 4 others); Wed, 23 Nov 2016 07:25:30 -0500 Received: from mail-pf0-f169.google.com ([209.85.192.169]:36287 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935534AbcKWMZ2 (ORCPT ); Wed, 23 Nov 2016 07:25:28 -0500 Received: by mail-pf0-f169.google.com with SMTP id 189so3512490pfz.3 for ; Wed, 23 Nov 2016 04:24:45 -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=+MOgptxOyffD8lMCWLZyQcp2DfEMcriwQXV9HSr1FnI=; b=Cnh4oNa2K49gLMGE/JeSIJHRdzoxO/TQ898J54rR/8ae09zbYGHFDAyHVMlTa4xzO6 yuUW/PlVSAkUMt7SQZD14MdI5j64LSEmFpM8g/RvE85BxzwTGTz/4E/NtdigUfq3GCD1 QkWQrmI9atIwz/FNUeRcsLJ+Qoy4tAv1tUH5E= 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=+MOgptxOyffD8lMCWLZyQcp2DfEMcriwQXV9HSr1FnI=; b=ZIEvZDV7ANMe/EHo4nHcNT0jFBj60rMBNbq6lSYG3EMpzOdKrsPmH/M+MlkTHd+qsd bj5hxDK948Dj6X0P5KblsWZTUZzg2elshnmnB7los0zNxZ2Rry44rDwHWSBMR2emGKLN 9BGnTleCgM5xfpQLLRi66V2jm52CH8aCZFPw6TRLnuzBTKXf+cc9Df1rFCN2A1X7dGDd 4aRt1xggx1wGzh0rqyad9+1mqqWOtYVe9Kj4yA0wdX7ZntQruD53BdSLnU2/K8x+wH74 PRCMBgvMgdEWeHPoCH+krEOXpuS3BFTf69NGh1eaLSKIZovCc4T1osN7PM49xrihaJDW E/XQ== X-Gm-Message-State: AKaTC02kiPY5hqgAjPm4RCJpeuCJbW9EWXLLjP9Iv3WY7q9df5AFlgzU6fFCpsrgYKglmDnw X-Received: by 10.84.216.80 with SMTP id f16mr6024199plj.91.1479903884626; Wed, 23 Nov 2016 04:24:44 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id 71sm52672038pft.25.2016.11.23.04.24.42 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Nov 2016 04:24:44 -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 v3 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume Date: Wed, 23 Nov 2016 20:24:23 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <57db2af374afdc0a92243eab0e385471eb51bf22.1479903678.git.baolin.wang@linaro.org> References: <57db2af374afdc0a92243eab0e385471eb51bf22.1479903678.git.baolin.wang@linaro.org> In-Reply-To: <57db2af374afdc0a92243eab0e385471eb51bf22.1479903678.git.baolin.wang@linaro.org> References: <57db2af374afdc0a92243eab0e385471eb51bf22.1479903678.git.baolin.wang@linaro.org> 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 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/Kconfig | 7 +++++++ drivers/usb/dwc3/core.c | 26 +++++++++++++++++++++++++- drivers/usb/dwc3/core.h | 15 +++++++++++++++ drivers/usb/dwc3/host.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 84 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/Kconfig b/drivers/usb/dwc3/Kconfig index a45b4f1..47bb2f3 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -47,6 +47,13 @@ config USB_DWC3_DUAL_ROLE endchoice +config USB_DWC3_HOST_SUSPEND + bool "Choose if the DWC3 host (xhci) can be suspend/resume" + depends on USB_DWC3_HOST=y || USB_DWC3_DUAL_ROLE=y + help + We can suspend the host when the slave is detached for power saving, + and resume the host when one slave is attached. + comment "Platform Glue Driver Support" config USB_DWC3_OMAP 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..db41908 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1226,4 +1226,19 @@ static inline void dwc3_ulpi_exit(struct dwc3 *dwc) { } #endif +#if IS_ENABLED(CONFIG_USB_DWC3_HOST_SUSPEND) +int dwc3_host_suspend(struct dwc3 *dwc); +int dwc3_host_resume(struct dwc3 *dwc); +#else +static inline int dwc3_host_suspend(struct dwc3 *dwc) +{ + return 0; +} + +static inline int dwc3_host_resume(struct dwc3 *dwc) +{ + return 0; +} +#endif + #endif /* __DRIVERS_USB_DWC3_CORE_H */ diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index ed82464..8e5309d6 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,39 @@ void dwc3_host_exit(struct dwc3 *dwc) dev_name(&dwc->xhci->dev)); platform_device_unregister(dwc->xhci); } + +#ifdef CONFIG_USB_DWC3_HOST_SUSPEND +int dwc3_host_suspend(struct dwc3 *dwc) +{ + struct device *xhci = &dwc->xhci->dev; + int ret; + + /* + * 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. + */ + ret = pm_runtime_put_sync(xhci); + if (ret) { + dev_err(xhci, "failed to suspend xHCI device\n"); + return ret; + } + + return 0; +} + +int dwc3_host_resume(struct dwc3 *dwc) +{ + struct device *xhci = &dwc->xhci->dev; + int ret; + + /* Resume the xHCI device synchronously. */ + ret = pm_runtime_get_sync(xhci); + if (ret) { + dev_err(xhci, "failed to resume xHCI device\n"); + return ret; + } + + return 0; +} +#endif