Re: [PATCH 1/2] usb: xhci: plat: Enable runtime PM
On Mon, Jul 25, 2016 at 02:47:53PM -0400, robert.f...@collabora.com wrote: > From: Andrew Bresticker> > Enable runtime PM for the xhci-plat device so that the parent device > may implement runtime PM. > > Signed-off-by: Andrew Bresticker Why are you forwarding on patches without adding your signed-off-by to them? Sorry, I can't take them without that... greg k-h
Re: [PATCH 1/2] usb: xhci: plat: Enable runtime PM
On Mon, Jul 25, 2016 at 02:47:53PM -0400, robert.f...@collabora.com wrote: > From: Andrew Bresticker > > Enable runtime PM for the xhci-plat device so that the parent device > may implement runtime PM. > > Signed-off-by: Andrew Bresticker Why are you forwarding on patches without adding your signed-off-by to them? Sorry, I can't take them without that... greg k-h
[PATCH 1/2] usb: xhci: plat: Enable runtime PM
From: Andrew BrestickerEnable runtime PM for the xhci-plat device so that the parent device may implement runtime PM. Signed-off-by: Andrew Bresticker --- 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 05647e6..1927950 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -182,6 +182,9 @@ static int xhci_plat_probe(struct platform_device *pdev) if (ret) goto dealloc_usb2_hcd; + pm_runtime_set_active(>dev); + pm_runtime_enable(>dev); + return 0; @@ -210,6 +213,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); + usb_remove_hcd(xhci->shared_hcd); usb_phy_shutdown(hcd->usb_phy); @@ -228,7 +233,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 @@ -237,15 +244,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
[PATCH 1/2] usb: xhci: plat: Enable runtime PM
From: Andrew Bresticker Enable runtime PM for the xhci-plat device so that the parent device may implement runtime PM. Signed-off-by: Andrew Bresticker --- 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 05647e6..1927950 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -182,6 +182,9 @@ static int xhci_plat_probe(struct platform_device *pdev) if (ret) goto dealloc_usb2_hcd; + pm_runtime_set_active(>dev); + pm_runtime_enable(>dev); + return 0; @@ -210,6 +213,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); + usb_remove_hcd(xhci->shared_hcd); usb_phy_shutdown(hcd->usb_phy); @@ -228,7 +233,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 @@ -237,15 +244,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