From patchwork Fri Nov 18 12:01:43 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: 82868 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp34616qge; Fri, 18 Nov 2016 04:02:30 -0800 (PST) X-Received: by 10.129.40.149 with SMTP id o143mr6831758ywo.106.1479470550018; Fri, 18 Nov 2016 04:02:30 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l143si1604215ywb.205.2016.11.18.04.02.29; Fri, 18 Nov 2016 04:02:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753698AbcKRMCX (ORCPT + 26 others); Fri, 18 Nov 2016 07:02:23 -0500 Received: from mail-pg0-f45.google.com ([74.125.83.45]:34986 "EHLO mail-pg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753599AbcKRMCM (ORCPT ); Fri, 18 Nov 2016 07:02:12 -0500 Received: by mail-pg0-f45.google.com with SMTP id p66so102585642pga.2 for ; Fri, 18 Nov 2016 04:02:11 -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=h8jLIleWegBytcgj9xBVMUX/fPziNkR/6W1XdGmC0qk=; b=NPC5I5M54ksq3hlmU6yJEKJq5Uc/z1wHOh4LQ4D9vrlUoFODZwDt517yTvys2on3Qe uB9Zn6PDf1VMSKg1dmJ/5HYWzVph/NZTSjsNRrUpQ3Njkw9nMIPK4dkjhX+yifYFom87 tPUJcv8nH+vIji8/bz8o42n8KMILRCFPhqm7w= 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=h8jLIleWegBytcgj9xBVMUX/fPziNkR/6W1XdGmC0qk=; b=XXIEdGak2RNmHCQhCj/WECZ7SGi0QlfpvN4zk4atiNIIUZe2eCBKTBVvVZMcwae7me 0Xg3hNXafo6BP298dKV9aUwP63ujTB4vELK2/QnhjzXD7Xr0CDQGPwUKW/ZcwYfVQtrr bCwf5ttcf2kQ+ZGyjo8/SbeJDNPlrw/CZ2ciqxU0Z5UsYhl2ddy3wavUHL3PxPhiq16U PyusenKjhUetT2JgRox7JUWiR8UgVB9nj6D4lsC8IIc1Bi7BZ82oUX1uvRc9N/NHLVJW /6fsdV1jc/c8Ck4hzsgnaxpMMnvaAytGYKFVKmDpzBJ242T+rFWUeBCexo8Nzpyx38qw ZFlg== X-Gm-Message-State: ABUngvfCLOJo6hbVygKzHUWZ2fonwdVL8c//MKZu2udonP6WqvX3f1fcPO4P2t2eM2XeovR6 X-Received: by 10.98.100.66 with SMTP id y63mr11378838pfb.49.1479470531265; Fri, 18 Nov 2016 04:02:11 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id 131sm17440836pfx.92.2016.11.18.04.02.08 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Nov 2016 04:02:10 -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 2/2] usb: dwc3: core: Support the dwc3 host suspend/resume Date: Fri, 18 Nov 2016 20:01:43 +0800 Message-Id: <85d3b2acbc173e285cf91847fa8ba128b469cbc1.1479470374.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 --- drivers/usb/dwc3/Kconfig | 7 ++++++ drivers/usb/dwc3/core.c | 26 ++++++++++++++++++++++- drivers/usb/dwc3/core.h | 15 +++++++++++++ drivers/usb/dwc3/host.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 1 deletion(-) -- 1.7.9.5 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..541d27c 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -19,6 +19,9 @@ #include "core.h" +#define DWC3_HOST_SUSPEND_COUNT 100 +#define DWC3_HOST_SUSPEND_TIMEOUT 100 + static int dwc3_host_get_irq(struct dwc3 *dwc) { struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); @@ -130,3 +133,53 @@ 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, cnt = DWC3_HOST_SUSPEND_COUNT; + + /* + * We need make sure the children of the xHCI device had been into + * suspend state, or we will suspend xHCI device failed. + */ + while (!pm_children_suspended(xhci) && --cnt > 0) + msleep(DWC3_HOST_SUSPEND_TIMEOUT); + + if (cnt <= 0) { + dev_err(xhci, "failed to suspend xHCI children device\n"); + return -EBUSY; + } + + /* + * If the xHCI device had been into suspend state, thus just return. + */ + if (pm_runtime_suspended(xhci)) + return 0; + + /* Suspend the xHCI device synchronously. */ + 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