From patchwork Tue Dec 13 07:49:06 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: 87801 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp2072495qgi; Mon, 12 Dec 2016 23:49:39 -0800 (PST) X-Received: by 10.84.210.228 with SMTP id a91mr197202109pli.0.1481615379149; Mon, 12 Dec 2016 23:49:39 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t13si38801975pfl.0.2016.12.12.23.49.38; Mon, 12 Dec 2016 23:49:39 -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 S932300AbcLMHtf (ORCPT + 25 others); Tue, 13 Dec 2016 02:49:35 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:32780 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752597AbcLMHtb (ORCPT ); Tue, 13 Dec 2016 02:49:31 -0500 Received: by mail-pf0-f181.google.com with SMTP id d2so17415214pfd.0 for ; Mon, 12 Dec 2016 23:49:31 -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; bh=81NEDKl2dDpLJcqjQ9w89oTPa3BA8DPxnZAinyGuuTU=; b=YgyMZHHILpVvO3Tcf7zAil1LPf82PMtfH5RDX1L+bnvFWHKryK3W5Q8TWOMi9yr6Kl Q73o4YL0x1IvVTl17sbRJ1oh281NbVqgxxOyufRe58obMwAuHE8VMyfU/HP8l+NPwIQA 19qKtdg931zZ/BxgxCMQ3DIYPZAdlMnANLEVM= 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; bh=81NEDKl2dDpLJcqjQ9w89oTPa3BA8DPxnZAinyGuuTU=; b=mXGPEtTGeuZA9JK2rqBCZ11sM03VVJyZfhHZd1FYkk8nUPDOju5Y/kh5foXLhlZJBA KUGRzic6sgCAZdVvdIKgUfjnFbrxQs+xs0WtrqpTIo9iBiISrdMIvS3uhcfKzHs4tBrp lK4WaSYeNWGqI8kuOrZWHVRfDcemafrfyqYmb47yPQoSwP/HfCPiai1tlTFuGn9Ofbdt I92CQu7lQqFS7Pp6xzaduiyiqTleYLuKTf0qem6I3OBNeRtB/+ieVYWUKWmZ+3d5JAbi iJ9F5UJ/0MGr29xIdRVwAod2aqq1drUe9ov3YVlubqXK87hrN7Ocs8Y1cT1byl7cU9AN TW/Q== X-Gm-Message-State: AKaTC00jLlHoqoBhitPSS/Hc8tEx0wdzoK3MPfXrrLK3aLVXsBPA/ZBl3Uf9xiMq7QYsWeEX X-Received: by 10.98.67.138 with SMTP id l10mr103257413pfi.101.1481615370927; Mon, 12 Dec 2016 23:49:30 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([175.111.195.49]) by smtp.gmail.com with ESMTPSA id r74sm79157553pfl.79.2016.12.12.23.49.28 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Dec 2016 23:49:30 -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 1/2] usb: host: plat: Enable xhci plat runtime PM Date: Tue, 13 Dec 2016 15:49:06 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Enable the xhci plat runtime PM for parent device to suspend/resume xhci. Also call pm_runtime_get_noresume() in probe() function in case the parent device doesn't call suspend/resume callback by runtime PM now. Signed-off-by: Baolin Wang --- Changes since v4: - No updates. Changes since v3: - Fix kbuild error. Changes since v2: - Add pm_runtime_get_noresume() in probe() function. - Add pm_runtime_set_suspended()/pm_runtime_put_noidle() in remove() function. Changes since v1: - No updates. --- drivers/usb/host/xhci-plat.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) -- 1.7.9.5 diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index ed56bf9..5805c6a 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -246,6 +246,10 @@ static int xhci_plat_probe(struct platform_device *pdev) if (ret) goto dealloc_usb2_hcd; + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + return 0; @@ -274,6 +278,10 @@ static int xhci_plat_remove(struct platform_device *dev) struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct clk *clk = xhci->clk; + pm_runtime_set_suspended(&dev->dev); + pm_runtime_put_noidle(&dev->dev); + pm_runtime_disable(&dev->dev); + usb_remove_hcd(xhci->shared_hcd); usb_phy_shutdown(hcd->usb_phy); @@ -311,14 +319,37 @@ static int xhci_plat_resume(struct device *dev) return xhci_resume(xhci, 0); } +#endif /* CONFIG_PM_SLEEP */ + +#ifdef CONFIG_PM +static int xhci_plat_runtime_suspend(struct device *dev) +{ + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct xhci_hcd *xhci = hcd_to_xhci(hcd); + + return xhci_suspend(xhci, device_may_wakeup(dev)); +} + +static int xhci_plat_runtime_resume(struct device *dev) +{ + struct usb_hcd *hcd = dev_get_drvdata(dev); + struct xhci_hcd *xhci = hcd_to_xhci(hcd); + + return xhci_resume(xhci, 0); +} + +static int xhci_plat_runtime_idle(struct device *dev) +{ + return 0; +} +#endif /* CONFIG_PM */ static const struct dev_pm_ops xhci_plat_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume) + + SET_RUNTIME_PM_OPS(xhci_plat_runtime_suspend, xhci_plat_runtime_resume, + xhci_plat_runtime_idle) }; -#define DEV_PM_OPS (&xhci_plat_pm_ops) -#else -#define DEV_PM_OPS NULL -#endif /* CONFIG_PM */ static const struct acpi_device_id usb_xhci_acpi_match[] = { /* XHCI-compliant USB Controller */ @@ -332,7 +363,7 @@ static int xhci_plat_resume(struct device *dev) .remove = xhci_plat_remove, .driver = { .name = "xhci-hcd", - .pm = DEV_PM_OPS, + .pm = &xhci_plat_pm_ops, .of_match_table = of_match_ptr(usb_xhci_of_match), .acpi_match_table = ACPI_PTR(usb_xhci_acpi_match), },