usb: xhci: plat: Enable PM, async resume/suspend
Subsystems (2)
v5 cover usb: xhci: plat: Enable PM, async resume/suspend
From: Robert Foss <[email protected]>
This series enables runtime PM and asynchronous resume/suspend support for xhci-plat devices.
Changes since v1:
- Added Signed-off-by: Robert Foss <[email protected]>
- 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(-)
Signature · 1 line
2.7.4
PATCH v5 1/2 usb: xhci: plat: Enable runtime PM
From: Robert Foss <[email protected]>
Enable runtime PM for the xhci-plat device so that the parent device may implement runtime PM.
--- drivers/usb/host/xhci-plat.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-plat.c +27 -2
@@ -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 = {
Signature · 1 line
2.7.4
Re: [PACTH v5 1/2] usb: xhci: plat: Enable runtime PM
Hi,
Quoted 36 lines · [email protected] writes:
From: Robert Foss <[email protected]>
Enable runtime PM for the xhci-plat device so that the parent device may implement runtime PM.
Signed-off-by Robert Foss <[email protected]>Tested-by Robert Foss <[email protected]>--- drivers/usb/host/xhci-plat.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-)drivers/usb/host/xhci-plat.c +5
-0@@ -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);
drivers/usb/host/xhci-plat.c static int xhci_plat_suspend(struct device *dev) · line 304
Quoted 8 lines
drivers/usb/host/xhci-plat.c +5
-0@@ -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.
Signature · 1 line
balbi
PATCH v5 2/2 usb: xhci: plat: Enable async suspend/resume
In reply to [email protected]From: Andrew Bresticker <[email protected]>
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.
--- drivers/usb/host/xhci-plat.c | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/xhci-plat.c +1 -0
@@ -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 ;
Signature · 1 line
2.7.4