* [PACTH v4 0/2] usb: xhci: plat: Enable PM, async resume/suspend @ 2016-08-09 15:40 robert.foss 2016-08-09 15:40 ` [PACTH v4 1/2] usb: xhci: plat: Enable runtime PM robert.foss 2016-08-09 15:40 ` [PACTH v4 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 15:40 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() Changes since v3: - Decrement usage_counter for failed pm_runtime_get*() calls 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 | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PACTH v4 1/2] usb: xhci: plat: Enable runtime PM 2016-08-09 15:40 [PACTH v4 0/2] usb: xhci: plat: Enable PM, async resume/suspend robert.foss @ 2016-08-09 15:40 ` robert.foss 2016-08-09 16:22 ` kbuild test robot 2016-08-09 15:40 ` [PACTH v4 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 15:40 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 | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index ed56bf9..2755a20 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,12 @@ 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 * to do wakeup during suspend. Since xhci_plat_suspend is currently @@ -301,15 +311,27 @@ 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) + atomic_dec(&dev->power.usage_count); + 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 = { -- 2.7.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PACTH v4 1/2] usb: xhci: plat: Enable runtime PM 2016-08-09 15:40 ` [PACTH v4 1/2] usb: xhci: plat: Enable runtime PM robert.foss @ 2016-08-09 16:22 ` kbuild test robot 0 siblings, 0 replies; 4+ messages in thread From: kbuild test robot @ 2016-08-09 16:22 UTC (permalink / raw) To: robert.foss Cc: kbuild-all, mathias.nyman, gregkh, linux-usb, linux-kernel, Julius Werner, Andrew Bresticker, Felipe Balbi, Robert Foss [-- Attachment #1: Type: text/plain, Size: 2484 bytes --] Hi Robert, [auto build test WARNING on usb/usb-testing] [also build test WARNING on v4.8-rc1 next-20160809] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/robert-foss-collabora-com/usb-xhci-plat-Enable-PM-async-resume-suspend/20160809-234302 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing config: i386-randconfig-s0-201632 (attached as .config) compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705 reproduce: # save the attached .config to linux build tree make ARCH=i386 All warnings (new ones prefixed by >>): drivers/usb/host/xhci-plat.c: In function 'xhci_plat_suspend': >> drivers/usb/host/xhci-plat.c:303:2: warning: this 'if' clause does not guard... [-Wmisleading-indentation] if (ret < 0) ^~ drivers/usb/host/xhci-plat.c:305:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' return ret; ^~~~~~ drivers/usb/host/xhci-plat.c: In function 'xhci_plat_resume': drivers/usb/host/xhci-plat.c:327:2: warning: this 'if' clause does not guard... [-Wmisleading-indentation] if (ret < 0) ^~ drivers/usb/host/xhci-plat.c:329:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' return ret; ^~~~~~ vim +/if +303 drivers/usb/host/xhci-plat.c 287 288 if (!IS_ERR(clk)) 289 clk_disable_unprepare(clk); 290 usb_put_hcd(hcd); 291 292 return 0; 293 } 294 295 #ifdef CONFIG_PM_SLEEP 296 static int xhci_plat_suspend(struct device *dev) 297 { 298 struct usb_hcd *hcd = dev_get_drvdata(dev); 299 struct xhci_hcd *xhci = hcd_to_xhci(hcd); 300 int ret; 301 302 ret = pm_runtime_get_sync(dev); > 303 if (ret < 0) 304 atomic_dec(&dev->power.usage_count); 305 return ret; 306 /* 307 * xhci_suspend() needs `do_wakeup` to know whether host is allowed 308 * to do wakeup during suspend. Since xhci_plat_suspend is currently 309 * only designed for system suspend, device_may_wakeup() is enough 310 * to dertermine whether host is allowed to do wakeup. Need to 311 * reconsider this when xhci_plat_suspend enlarges its scope, e.g., --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/octet-stream, Size: 34089 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PACTH v4 2/2] usb: xhci: plat: Enable async suspend/resume 2016-08-09 15:40 [PACTH v4 0/2] usb: xhci: plat: Enable PM, async resume/suspend robert.foss 2016-08-09 15:40 ` [PACTH v4 1/2] usb: xhci: plat: Enable runtime PM robert.foss @ 2016-08-09 15:40 ` robert.foss 1 sibling, 0 replies; 4+ messages in thread From: robert.foss @ 2016-08-09 15:40 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 2755a20..55b2254 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 [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-08-09 16:24 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-08-09 15:40 [PACTH v4 0/2] usb: xhci: plat: Enable PM, async resume/suspend robert.foss 2016-08-09 15:40 ` [PACTH v4 1/2] usb: xhci: plat: Enable runtime PM robert.foss 2016-08-09 16:22 ` kbuild test robot 2016-08-09 15:40 ` [PACTH v4 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
Powered by JetHome