Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1458236 > unrolled thread

[PACTH v3 1/2] usb: xhci: plat: Enable runtime PM

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PACTH v3 1/2] usb: xhci: plat: Enable runtime PM robert.foss@collabora.com - 2016-08-08 22:50 +0200
    Re: [PACTH v3 1/2] usb: xhci: plat: Enable runtime PM Felipe Balbi <felipe.balbi@linux.intel.com> - 2016-08-09 11:30 +0200
      Re: [PACTH v3 1/2] usb: xhci: plat: Enable runtime PM Robert Foss <robert.foss@collabora.com> - 2016-08-09 17:40 +0200

#1458236 — [PACTH v3 1/2] usb: xhci: plat: Enable runtime PM

From: Andrew Bresticker <abrestic@chromium.org>

Enable runtime PM for the xhci-plat device so that the parent device
may implement runtime PM.

Signed-off-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 | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index ed56bf9..4f39d4e 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,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 = {
-- 
2.7.4

[toc] | [next] | [standalone]

#1458538

[Multipart message — attachments visible in raw view] — view raw

Hi,

robert.foss@collabora.com writes:
> From: Andrew Bresticker <abrestic@chromium.org>
>
> Enable runtime PM for the xhci-plat device so that the parent device
> may implement runtime PM.
>
> Signed-off-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 | 24 ++++++++++++++++++++++--
>  1 file changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index ed56bf9..4f39d4e 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,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.

>  	/*
>  	 * 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;

ditto

-- 
balbi

[toc] | [prev] | [next] | [standalone]

#1458860

On 2016-08-09 05:19 AM, Felipe Balbi wrote:
>
> Hi,
>
> robert.foss@collabora.com writes:
>> From: Andrew Bresticker <abrestic@chromium.org>
>>
>> Enable runtime PM for the xhci-plat device so that the parent device
>> may implement runtime PM.
>>
>> Signed-off-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 | 24 ++++++++++++++++++++++--
>>  1 file changed, 22 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
>> index ed56bf9..4f39d4e 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,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.
>
>>  	/*
>>  	 * 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;
>
> ditto
>

Thanks Filipe!
I'll be submitting a v4 as soon as testing has completed.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web