[PATCH] mmc: sdhci-brcmstb: Fix mmc timeout errors on S5 suspend

[Ulf Hansson]

On Thu, 7 Jan 2021 at 23:15, Al Cooper <alcooperx at gmail.com> wrote:
>
> Commit e7b5d63a82fe ("mmc: sdhci-brcmstb: Add shutdown callback")
> that added a shutdown callback to the diver, is causing "mmc timeout"
> errors on S5 suspend. The problem was that the "remove" was queuing
> additional MMC commands after the "shutdown" and these caused
> timeouts as the MMC queues were cleaned up for "remove". The
> shutdown callback will be changed to calling sdhci-pltfm_suspend
> which should get better power savings because the clocks will be
> shutdown.
>
> Fixes: e7b5d63a82fe ("mmc: sdhci-brcmstb: Add shutdown callback")
> Signed-off-by: Al Cooper <alcooperx at gmail.com>

Applied for fixes and by adding a stable tag, thanks!

Kind regards
Uffe


> ---
>  drivers/mmc/host/sdhci-brcmstb.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
> index bbf3496f4495..f9780c65ebe9 100644
> --- a/drivers/mmc/host/sdhci-brcmstb.c
> +++ b/drivers/mmc/host/sdhci-brcmstb.c
> @@ -314,11 +314,7 @@ static int sdhci_brcmstb_probe(struct platform_device *pdev)
>
>  static void sdhci_brcmstb_shutdown(struct platform_device *pdev)
>  {
> -       int ret;
> -
> -       ret = sdhci_pltfm_unregister(pdev);
> -       if (ret)
> -               dev_err(&pdev->dev, "failed to shutdown\n");
> +       sdhci_pltfm_suspend(&pdev->dev);
>  }
>
>  MODULE_DEVICE_TABLE(of, sdhci_brcm_of_match);
> --
> 2.17.1
>