From: robert.foss@collabora.com
To: mathias.nyman@intel.com, gregkh@linuxfoundation.org,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andrew Bresticker <abrestic@chromium.org>,
Robert Foss <robert.foss@collabora.com>
Subject: [PACTH v1 1/2] usb: xhci: plat: Enable runtime PM
Date: Thu, 28 Jul 2016 17:19:21 -0400 [thread overview]
Message-ID: <1469740762-18234-2-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <1469740762-18234-1-git-send-email-robert.foss@collabora.com>
From: Andrew Bresticker <abrestic@chromium.org>
Enable runtime PM for the xhci-plat device so that the parent device
may implement runtime PM.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Tested-by: Robert Foss <robert.foss@collabora.com>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
drivers/usb/host/xhci-plat.c | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index ed56bf9..fbd45c2 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -246,6 +246,9 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (ret)
goto dealloc_usb2_hcd;
+ pm_runtime_set_active(&pdev->dev);
+ pm_runtime_enable(&pdev->dev);
+
return 0;
@@ -274,6 +277,8 @@ static int xhci_plat_remove(struct platform_device *dev)
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
struct clk *clk = xhci->clk;
+ pm_runtime_disable(&dev->dev);
+
usb_remove_hcd(xhci->shared_hcd);
usb_phy_shutdown(hcd->usb_phy);
@@ -292,7 +297,9 @@ static int xhci_plat_suspend(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+ int ret;
+ pm_runtime_get_sync(dev);
/*
* xhci_suspend() needs `do_wakeup` to know whether host is allowed
* to do wakeup during suspend. Since xhci_plat_suspend is currently
@@ -301,15 +308,23 @@ static int xhci_plat_suspend(struct device *dev)
* reconsider this when xhci_plat_suspend enlarges its scope, e.g.,
* also applies to runtime suspend.
*/
- return xhci_suspend(xhci, device_may_wakeup(dev));
+ ret = xhci_suspend(xhci, device_may_wakeup(dev));
+ pm_runtime_put(dev);
+
+ return ret;
}
static int xhci_plat_resume(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+ int ret;
- return xhci_resume(xhci, 0);
+ pm_runtime_get_sync(dev);
+ ret = xhci_resume(xhci, 0);
+ pm_runtime_put(dev);
+
+ return ret;
}
static const struct dev_pm_ops xhci_plat_pm_ops = {
--
2.7.4
next prev parent reply other threads:[~2016-07-28 21:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-28 21:19 [PACTH v1 0/2] usb: xhci: plat: Enable PM, async resume/suspend robert.foss
2016-07-28 21:19 ` robert.foss [this message]
2016-07-29 0:24 ` [PACTH v1 1/2] usb: xhci: plat: Enable runtime PM Felipe Balbi
2016-07-29 13:31 ` Robert Foss
2016-07-28 21:19 ` [PACTH v1 2/2] usb: xhci: plat: Enable async suspend/resume robert.foss
2016-07-28 21:24 ` [PACTH v1 0/2] usb: xhci: plat: Enable PM, async resume/suspend Robert Foss
2016-07-29 0:25 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469740762-18234-2-git-send-email-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=abrestic@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).