From patchwork Mon Nov 28 06:43:50 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: 84361 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1007158qgi; Sun, 27 Nov 2016 22:44:23 -0800 (PST) X-Received: by 10.84.174.129 with SMTP id r1mr45157277plb.19.1480315463020; Sun, 27 Nov 2016 22:44:23 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b10si53828852pga.13.2016.11.27.22.44.22; Sun, 27 Nov 2016 22:44:23 -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 S1754321AbcK1GoU (ORCPT + 4 others); Mon, 28 Nov 2016 01:44:20 -0500 Received: from mail-pf0-f172.google.com ([209.85.192.172]:36696 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754300AbcK1GoR (ORCPT ); Mon, 28 Nov 2016 01:44:17 -0500 Received: by mail-pf0-f172.google.com with SMTP id 189so23166640pfz.3 for ; Sun, 27 Nov 2016 22:44:17 -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=dEzriVUELP7e8TfdqdYZ5ffgwQKTxF2W1iiOelbQVhA=; b=M1gtBoP5q/W+j3K8uuAeF/gw5uOQzP7feoOxgEDVVxjMi8IRztZDBmkpUBv1z3pRs0 NlgtDAkykwYrm0J0Z3WeCpfJjxe+Oh3hIU3/Y1KwnGLNkdA1Wd53YUzHGVsfDYDagiNc b70azcamJbXVdP7u8ChbSOEtKvOJycrGn7Eyo= 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=dEzriVUELP7e8TfdqdYZ5ffgwQKTxF2W1iiOelbQVhA=; b=N4N939fABHfqF7+uK/ZHTK0gHj+iHMoeIBd4zQ5zOLD3QOW5vZ5/fJRsUdeqoFSNLq DlIO1pjsxcR9V2NecFhSlbCFDlIFxus7HF5L9Jf22nMl9A8TAqYKQEE3Dn0cpMlYgaXt uSm7vdw6B3usRFai0BoOxW4a5hFhb/djITOtaaXXzUIgdBebbm79GP+/ItaFbtw0bm5U mz4thTWx/wjiqzP+Fo/yxMP2tyOXnG507sRPYPzvKYh9ICzzl4kEO1I2/0fAMmDCaoIu P3ZYdPvyLcShaIk9BSLIFMhVWzvKCDhQdDaR3p92G73A6+EkJtXtcxuAHjigfdz0jU5p Va4g== X-Gm-Message-State: AKaTC0395Pl5sJL7u1ZwPZR08GkGBkiDsxMH6dg/o3rfiFuki4QS9Ff2ChltnmIHzBdCBErY X-Received: by 10.84.168.129 with SMTP id f1mr47073368plb.42.1480315456560; Sun, 27 Nov 2016 22:44:16 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id y189sm84197974pfy.32.2016.11.27.22.44.14 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 27 Nov 2016 22:44:16 -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 v4 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume Date: Mon, 28 Nov 2016 14:43:50 +0800 Message-Id: <5e67c4a6680bbc7c02e92305d81eda5449b8a4af.1479991143.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 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/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