From patchwork Mon Nov 28 06:43:49 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: 84360 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1007143qgi; Sun, 27 Nov 2016 22:44:17 -0800 (PST) X-Received: by 10.98.25.205 with SMTP id 196mr20374359pfz.46.1480315457720; Sun, 27 Nov 2016 22:44:17 -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.17; Sun, 27 Nov 2016 22:44:17 -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 S1754294AbcK1GoP (ORCPT + 4 others); Mon, 28 Nov 2016 01:44:15 -0500 Received: from mail-pf0-f175.google.com ([209.85.192.175]:35517 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754290AbcK1GoO (ORCPT ); Mon, 28 Nov 2016 01:44:14 -0500 Received: by mail-pf0-f175.google.com with SMTP id i88so23092280pfk.2 for ; Sun, 27 Nov 2016 22:44:13 -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=JvnnVRn+X5xUfD08m9cd7lMLMNsQrFPm4/MJ5s6D9vk=; b=ZcqI99UFiMWYDpVrVjOl9/05LAyrZkZL47Sxc+mYxMwy01wBPS7eXuNCyle/cRtAKi pyAZ2+lPvjzzVGaGkTcTBtPR8yErHpFhjkUHL1smco+Bmr8f/wAZuRdCvLnu159rG6oU GzziGRUE24seqI5+1nA3VBK0HyXMMkgKIDPi8= 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=JvnnVRn+X5xUfD08m9cd7lMLMNsQrFPm4/MJ5s6D9vk=; b=O71e8tMdVS+FgmSf+k4O4Xbw0rUigKRcW8fZrg6Hblf/Fb+m/QRX54X6HgRFDC1YDY 6wOwxaeq13lul/Sr0Ke6L3UuodBT4Br2EZj1UyCfLM2MjJ/bnxSI8/CfeuMEIAFKMcHw KdydxctFTOVIaEh+eJ6i4re0DL09+D1chMDswrf7WiOuzlLWOlDECOjBIoXI+7+8OjPk k2iEeoZELW7iE5Bm4PfmHpuYrVhr2Lq94wTz2pskD1r2XB/OllVYfiJCdWVvN9veDVBm mesuCLrudUwzDzfGL0/Sk34yM/mgQlXbDeCWaYexDnq+jS4XJVhTas7c9mQcaSabwGi4 rHNA== X-Gm-Message-State: AKaTC03Qq3EMyMNhivOPWNqUXCzMDi22yBrVcZ3mGGo4oP9cBstfxoUYaafEJKju7QcQVrR7 X-Received: by 10.84.177.129 with SMTP id x1mr41833161plb.105.1480315451854; Sun, 27 Nov 2016 22:44:11 -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.09 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 27 Nov 2016 22:44: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 v4 1/2] usb: host: plat: Enable xhci plat runtime PM Date: Mon, 28 Nov 2016 14:43:49 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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 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 -- 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/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), },