* [PACTH v5 0/2] usb: xhci: plat: Enable PM, async resume/suspend
@ 2016-08-09 16:38 robert.foss
2016-08-09 16:38 ` [PACTH v5 1/2] usb: xhci: plat: Enable runtime PM robert.foss
2016-08-09 16:38 ` [PACTH v5 2/2] usb: xhci: plat: Enable async suspend/resume robert.foss
0 siblings, 2 replies; 4+ messages in thread
From: robert.foss @ 2016-08-09 16:38 UTC (permalink / raw)
To: mathias.nyman, gregkh, linux-usb, linux-kernel, Julius Werner,
Andrew Bresticker, Felipe Balbi
Cc: Robert Foss
From: Robert Foss <robert.foss@collabora.com>
This series enables runtime PM and asynchronous resume/suspend support for
xhci-plat devices.
Changes since v1:
- Added Signed-off-by: Robert Foss <robert.foss@collabora.com>
- Added proper metadata tags to series
Changes since v2:
- Added missing changelog to cover-letter
- Added error checking to pm_runtime_get_sync() calls
Changes since v3:
- Decrement usage_counter for failed pm_runtime_get*() calls
Changes since v4:
- Added missing brackets
Andrew Bresticker (1):
usb: xhci: plat: Enable async suspend/resume
Robert Foss (1):
usb: xhci: plat: Enable runtime PM
drivers/usb/host/xhci-plat.c | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PACTH v5 1/2] usb: xhci: plat: Enable runtime PM
2016-08-09 16:38 [PACTH v5 0/2] usb: xhci: plat: Enable PM, async resume/suspend robert.foss
@ 2016-08-09 16:38 ` robert.foss
2016-08-10 9:46 ` Felipe Balbi
2016-08-09 16:38 ` [PACTH v5 2/2] usb: xhci: plat: Enable async suspend/resume robert.foss
1 sibling, 1 reply; 4+ messages in thread
From: robert.foss @ 2016-08-09 16:38 UTC (permalink / raw)
To: mathias.nyman, gregkh, linux-usb, linux-kernel, Julius Werner,
Andrew Bresticker, Felipe Balbi
Cc: Robert Foss
From: Robert Foss <robert.foss@collabora.com>
Enable runtime PM for the xhci-plat device so that the parent device
may implement runtime PM.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
Tested-by: Robert Foss <robert.foss@collabora.com>
---
drivers/usb/host/xhci-plat.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index ed56bf9..7d3d111 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,6 +297,13 @@ 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;
+
+ ret = pm_runtime_get_sync(dev);
+ if (ret < 0) {
+ atomic_dec(&dev->power.usage_count);
+ return ret;
+ }
/*
* xhci_suspend() needs `do_wakeup` to know whether host is allowed
@@ -301,15 +313,28 @@ 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);
+ ret = pm_runtime_get_sync(dev);
+ if (ret < 0) {
+ atomic_dec(&dev->power.usage_count);
+ return ret;
+ }
+
+ ret = xhci_resume(xhci, 0);
+ pm_runtime_put(dev);
+
+ return ret;
}
static const struct dev_pm_ops xhci_plat_pm_ops = {
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PACTH v5 2/2] usb: xhci: plat: Enable async suspend/resume
2016-08-09 16:38 [PACTH v5 0/2] usb: xhci: plat: Enable PM, async resume/suspend robert.foss
2016-08-09 16:38 ` [PACTH v5 1/2] usb: xhci: plat: Enable runtime PM robert.foss
@ 2016-08-09 16:38 ` robert.foss
1 sibling, 0 replies; 4+ messages in thread
From: robert.foss @ 2016-08-09 16:38 UTC (permalink / raw)
To: mathias.nyman, gregkh, linux-usb, linux-kernel, Julius Werner,
Andrew Bresticker, Felipe Balbi
Cc: Robert Foss
From: Andrew Bresticker <abrestic@chromium.org>
USB host controllers can take a significant amount of time to suspend
and resume, adding several hundred miliseconds to the kernel resume
time. Since the XHCI controller has no outside dependencies (other than
clocks, which are suspended late/resumed early), allow it to suspend and
resume asynchronously.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Tested-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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 7d3d111..6703679 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -248,6 +248,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
pm_runtime_set_active(&pdev->dev);
pm_runtime_enable(&pdev->dev);
+ device_enable_async_suspend(&pdev->dev);
return 0;
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PACTH v5 1/2] usb: xhci: plat: Enable runtime PM
2016-08-09 16:38 ` [PACTH v5 1/2] usb: xhci: plat: Enable runtime PM robert.foss
@ 2016-08-10 9:46 ` Felipe Balbi
0 siblings, 0 replies; 4+ messages in thread
From: Felipe Balbi @ 2016-08-10 9:46 UTC (permalink / raw)
To: robert.foss, mathias.nyman, gregkh, linux-usb, linux-kernel,
Julius Werner, Andrew Bresticker
Cc: Robert Foss
[-- Attachment #1: Type: text/plain, Size: 1612 bytes --]
Hi,
robert.foss@collabora.com writes:
> From: Robert Foss <robert.foss@collabora.com>
>
> Enable runtime PM for the xhci-plat device so that the parent device
> may implement runtime PM.
>
> Signed-off-by: Robert Foss <robert.foss@collabora.com>
>
> Tested-by: Robert Foss <robert.foss@collabora.com>
> ---
> drivers/usb/host/xhci-plat.c | 29 +++++++++++++++++++++++++++--
> 1 file changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index ed56bf9..7d3d111 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,6 +297,13 @@ 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;
> +
> + ret = pm_runtime_get_sync(dev);
> + if (ret < 0) {
> + atomic_dec(&dev->power.usage_count);
almost :-) You don't access power.usage_count directly :-)
A pm_runtime_put() should do it, but perhaps there's a better version
for this case.
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-10 18:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-09 16:38 [PACTH v5 0/2] usb: xhci: plat: Enable PM, async resume/suspend robert.foss
2016-08-09 16:38 ` [PACTH v5 1/2] usb: xhci: plat: Enable runtime PM robert.foss
2016-08-10 9:46 ` Felipe Balbi
2016-08-09 16:38 ` [PACTH v5 2/2] usb: xhci: plat: Enable async suspend/resume robert.foss
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).