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
Changes since v5:
- Switched out atomic_dec() calls with pm_runtime_put() calls
Changes since v6:
- Rebased on v4.9-final
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.11.0
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.
Signed-off-by: Andrew Bresticker <[email protected]>
Tested-by: Andrew Bresticker <[email protected]>
Tested-by: Robert Foss <[email protected]>
Signed-off-by: Robert Foss <[email protected]>
---
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 ba4efe74f537..c35b7fe3c999 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.11.0
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(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index ed56bf9ed885..ba4efe74f537 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) {
+ pm_runtime_put(dev);
+ 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) {
+ pm_runtime_put(dev);
+ return ret;
+ }
+
+ ret = xhci_resume(xhci, 0);
+ pm_runtime_put(dev);
+
+ return ret;
}
static const struct dev_pm_ops xhci_plat_pm_ops = {
--
2.11.0
Hey,
I was hoping to get an ACK on v7, if there is anything I can to do
expedite the process please let me know!
Rob.
On 2016-12-01 04:46 PM, Robert Foss wrote:
> 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
>
> Changes since v5:
> - Switched out atomic_dec() calls with pm_runtime_put() calls
>
> Changes since v6:
> - Rebased on v4.9-final
>
>
> 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(-)
>
Hi Robert,
On 2 December 2016 at 05:46, Robert Foss <[email protected]> wrote:
> 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(-)
>
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index ed56bf9ed885..ba4efe74f537 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);
You did not implement the runtime callbacks of xHCI device, then how
can the parent device control the resume/suspend of xHCI device by
runtime PM mechanism? Could you see my previous patch which implement
the runtime callbacks for xHCI device?
https://lkml.org/lkml/2016/11/28/25
> +
> 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) {
> + pm_runtime_put(dev);
> + 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) {
> + pm_runtime_put(dev);
> + return ret;
> + }
> +
> + ret = xhci_resume(xhci, 0);
> + pm_runtime_put(dev);
> +
> + return ret;
> }
>
> static const struct dev_pm_ops xhci_plat_pm_ops = {
> --
> 2.11.0
>
--
Baolin.wang
Best Regards
Hey Baolin,
On 2016-12-12 12:21 AM, Baolin Wang wrote:
> Hi Robert,
>
> On 2 December 2016 at 05:46, Robert Foss <[email protected]> wrote:
>> 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(-)
>>
>> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
>> index ed56bf9ed885..ba4efe74f537 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);
>
> You did not implement the runtime callbacks of xHCI device, then how
> can the parent device control the resume/suspend of xHCI device by
> runtime PM mechanism? Could you see my previous patch which implement
> the runtime callbacks for xHCI device?
> https://lkml.org/lkml/2016/11/28/25
>
Pardon my ignorance, but which exact functions need to be implemented?
Also, does the lkml link you provided contain an example implementation
of those functions?
>> +
>> 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) {
>> + pm_runtime_put(dev);
>> + 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) {
>> + pm_runtime_put(dev);
>> + return ret;
>> + }
>> +
>> + ret = xhci_resume(xhci, 0);
>> + pm_runtime_put(dev);
>> +
>> + return ret;
>> }
>>
>> static const struct dev_pm_ops xhci_plat_pm_ops = {
>> --
>> 2.11.0
>>
>
>
>
Hi Robert,
On 14 December 2016 at 14:43, Robert Foss <[email protected]> wrote:
> Hey Baolin,
>
> On 2016-12-12 12:21 AM, Baolin Wang wrote:
>>
>> Hi Robert,
>>
>> On 2 December 2016 at 05:46, Robert Foss <[email protected]>
>> wrote:
>>>
>>> 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(-)
>>>
>>> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
>>> index ed56bf9ed885..ba4efe74f537 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);
>>
>>
>> You did not implement the runtime callbacks of xHCI device, then how
>> can the parent device control the resume/suspend of xHCI device by
>> runtime PM mechanism? Could you see my previous patch which implement
>> the runtime callbacks for xHCI device?
>> https://lkml.org/lkml/2016/11/28/25
>>
>
> Pardon my ignorance, but which exact functions need to be implemented?
> Also, does the lkml link you provided contain an example implementation of
> those functions?
Please check below link:
https://lkml.org/lkml/2016/12/13/32
https://lkml.org/lkml/2016/12/13/34
>
>
>>> +
>>> 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) {
>>> + pm_runtime_put(dev);
>>> + 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) {
>>> + pm_runtime_put(dev);
>>> + return ret;
>>> + }
>>> +
>>> + ret = xhci_resume(xhci, 0);
>>> + pm_runtime_put(dev);
>>> +
>>> + return ret;
>>> }
>>>
>>> static const struct dev_pm_ops xhci_plat_pm_ops = {
>>> --
>>> 2.11.0
>>>
>>
>>
>>
>
--
Baolin.wang
Best Regards