2015-11-26 16:41:16

by Ludovic Desroches

Subject: [PATCH] mmc: sdhci-of-at91: controller is suspended too early

When calling sdhci_add_host(), the controller is already suspended. It
causes to read 0 in registers.
Increment the device's usage counter before calling sdhci_add_host(),
decrement it after and put it in suspend if it is possible.

Signed-off-by: Ludovic Desroches <[email protected]>
Fixes: "mmc: sdhci-of-at91: add PM support"
---
drivers/mmc/host/sdhci-of-at91.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
index 81ab9db..7e7d8f0 100644
--- a/drivers/mmc/host/sdhci-of-at91.c
+++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -200,6 +200,7 @@ static int sdhci_at91_probe(struct platform_device *pdev)

sdhci_get_of_property(pdev);

+ pm_runtime_get_noresume(&pdev->dev);
pm_runtime_set_active(&pdev->dev);
pm_runtime_enable(&pdev->dev);
pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
@@ -209,6 +210,8 @@ static int sdhci_at91_probe(struct platform_device *pdev)
if (ret)
goto pm_runtime_disable;

+ pm_runtime_put_autosuspend(&pdev->dev);
+
return 0;

pm_runtime_disable:
--
2.5.0

2015-11-27 14:12:02

by Ulf Hansson

Subject: Re: [PATCH] mmc: sdhci-of-at91: controller is suspended too early

On 26 November 2015 at 17:41, Ludovic Desroches
<[email protected]> wrote:
> When calling sdhci_add_host(), the controller is already suspended. It
> causes to read 0 in registers.
> Increment the device's usage counter before calling sdhci_add_host(),
> decrement it after and put it in suspend if it is possible.
>
> Signed-off-by: Ludovic Desroches <[email protected]>
> Fixes: "mmc: sdhci-of-at91: add PM support"

Thanks, applied for next!

Actually I decided to squash this change into the "Fixes commit"
itself, thus not breaking bisecting.

Kind regards
Uffe

> ---
> drivers/mmc/host/sdhci-of-at91.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c
> index 81ab9db..7e7d8f0 100644
> --- a/drivers/mmc/host/sdhci-of-at91.c
> +++ b/drivers/mmc/host/sdhci-of-at91.c
> @@ -200,6 +200,7 @@ static int sdhci_at91_probe(struct platform_device *pdev)
>
> sdhci_get_of_property(pdev);
>
> + pm_runtime_get_noresume(&pdev->dev);
> pm_runtime_set_active(&pdev->dev);
> pm_runtime_enable(&pdev->dev);
> pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
> @@ -209,6 +210,8 @@ static int sdhci_at91_probe(struct platform_device *pdev)
> if (ret)
> goto pm_runtime_disable;
>
> + pm_runtime_put_autosuspend(&pdev->dev);
> +
> return 0;
>
> pm_runtime_disable:
> --
> 2.5.0
>

2015-11-27 14:22:26

by Ludovic Desroches

Subject: Re: [PATCH] mmc: sdhci-of-at91: controller is suspended too early

On Fri, Nov 27, 2015 at 03:11:58PM +0100, Ulf Hansson wrote:
> On 26 November 2015 at 17:41, Ludovic Desroches
> <[email protected]> wrote:
> > When calling sdhci_add_host(), the controller is already suspended. It
> > causes to read 0 in registers.
> > Increment the device's usage counter before calling sdhci_add_host(),
> > decrement it after and put it in suspend if it is possible.
> >
> > Signed-off-by: Ludovic Desroches <[email protected]>
> > Fixes: "mmc: sdhci-of-at91: add PM support"
>
> Thanks, applied for next!
>
> Actually I decided to squash this change into the "Fixes commit"
> itself, thus not breaking bisecting.

Ok perfect. Thanks

Regards

Ludovic