diff mbox

mmc: sdhci-of-at91: controller is suspended too early

Message ID 1448556091-502-1-git-send-email-ludovic.desroches@atmel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ludovic Desroches Nov. 26, 2015, 4:41 p.m. UTC
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 <ludovic.desroches@atmel.com>
Fixes: "mmc: sdhci-of-at91: add PM support"
---
 drivers/mmc/host/sdhci-of-at91.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Ulf Hansson Nov. 27, 2015, 2:11 p.m. UTC | #1
On 26 November 2015 at 17:41, Ludovic Desroches
<ludovic.desroches@atmel.com> 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 <ludovic.desroches@atmel.com>
> 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
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ludovic Desroches Nov. 27, 2015, 2:22 p.m. UTC | #2
On Fri, Nov 27, 2015 at 03:11:58PM +0100, Ulf Hansson wrote:
> On 26 November 2015 at 17:41, Ludovic Desroches
> <ludovic.desroches@atmel.com> 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 <ludovic.desroches@atmel.com>
> > 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
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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: