usb: xhci: plat: Enable PM, async resume/suspend
Subsystems (2)
v3 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.
This is a resumbmission of v3.
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().
Andrew Bresticker (2):
usb: xhci: plat: Enable runtime PM
usb: xhci: plat: Enable async suspend/resume
drivers/usb/host/xhci-plat.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
Signature · 1 line
2.7.4
PATCH v3 1/2 usb: xhci: plat: Enable runtime PM
From: Andrew Bresticker <[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 | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-plat.c +22 -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,7 +297,11 @@ 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 ) +return ret;/* * xhci_suspend() needs `do_wakeup` to know whether host is allowed * to do wakeup during suspend. Since xhci_plat_suspend is currently
@@ -301,15 +310,26 @@ 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; + + ret =pm_runtime_get_sync (dev); +if (ret <0 ) +return ret; -return xhci_resume (xhci,0 ); + 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 v3 1/2] usb: xhci: plat: Enable runtime PM
Hi,
Quoted 36 lines · [email protected] writes:
From: Andrew Bresticker <[email protected]>
Enable runtime PM for the xhci-plat device so that the parent device may implement runtime PM.
Signed-off-by Andrew Bresticker <[email protected]>Tested-by Robert Foss <[email protected]>Signed-off-by Robert Foss <[email protected]>--- drivers/usb/host/xhci-plat.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 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 +4
-0@@ -292,7 +297,11 @@ 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 ) +return ret;
you're leaving unbalanced PM usage_counter here. If pm_runtime_get*() fails, you still have to decrement usage_counter.
Quoted 13 lines
drivers/usb/host/xhci-plat.c +4
-1/* * xhci_suspend() needs `do_wakeup` to know whether host is allowed * to do wakeup during suspend. Since xhci_plat_suspend is currently @@ -301,15 +310,26 @@ 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; }
drivers/usb/host/xhci-plat.c static int xhci_plat_suspend(struct device *dev) · line 327
Quoted 10 lines
drivers/usb/host/xhci-plat.c +5
-0static 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; + + ret =pm_runtime_get_sync (dev); +if (ret <0 ) +return ret;
ditto
Signature · 1 line
balbi
Re: [PACTH v3 1/2] usb: xhci: plat: Enable runtime PM
Quoted 66 lines · Felipe Balbi
Hi,
Quoted 36 lines · [email protected] writes:
From: Andrew Bresticker <[email protected]>
Enable runtime PM for the xhci-plat device so that the parent device may implement runtime PM.
Signed-off-by Andrew Bresticker <[email protected]>Tested-by Robert Foss <[email protected]>Signed-off-by Robert Foss <[email protected]>--- drivers/usb/host/xhci-plat.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 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 +4
-0@@ -292,7 +297,11 @@ 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 ) +return ret;you're leaving unbalanced PM
usage_counterhere. If pm_runtime_get*() fails, you still have to decrementusage_counter.Quoted 14 lines
drivers/usb/host/xhci-plat.c +4
-1/* * xhci_suspend() needs `do_wakeup` to know whether host is allowed * to do wakeup during suspend. Since xhci_plat_suspend is currently @@ -301,15 +310,26 @@ 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; }
Quoted 12 lines
drivers/usb/host/xhci-plat.c static int xhci_plat_suspend(struct device *dev) · line 327
Quoted 9 lines
drivers/usb/host/xhci-plat.c +5
-0static 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; + + ret =pm_runtime_get_sync (dev); +if (ret <0 ) +return ret;ditto
Thanks Filipe!
I'll be submitting a v4 as soon as testing has completed.
PATCH v3 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