[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <e4424388-2c6c-7736-da45-7b3b20b9ebbd@intel.com>
Date: Tue, 18 Feb 2020 11:12:20 +0200
From: Adrian Hunter <adrian.hunter@...el.com>
To: Shaik Sajida Bhanu <sbhanu@...eaurora.org>, ulf.hansson@...aro.org,
robh+dt@...nel.org, mka@...omium.org
Cc: asutoshd@...eaurora.org, swboyd@...gle.com,
stummala@...eaurora.org, sayalil@...eaurora.org,
cang@...eaurora.org, vbadigan@...eaurora.org,
rampraka@...eaurora.org, linux-mmc@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-msm@...r.kernel.org,
devicetree@...r.kernel.org, agross@...nel.org,
bjorn.andersson@...aro.org
Subject: Re: [PATCH V3] mmc: sdhci-msm: Update system suspend/resume callbacks
of sdhci-msm platform driver
On 12/02/20 9:31 am, Shaik Sajida Bhanu wrote:
> The existing suspend/resume callbacks of sdhci-msm driver are just
> gating/un-gating the clocks. During suspend cycle more can be done
> like disabling controller, disabling card detection, enabling wake-up events.
>
> So updating the system pm callbacks for performing these extra
> actions besides controlling the clocks.
>
> Signed-off-by: Shaik Sajida Bhanu <sbhanu@...eaurora.org>
>
> Changes since V2:
> Removed disabling/enabling pwr-irq from system pm ops.
>
> Changes since V1:
> Invoking pm_runtime_force_suspend/resume instead of
> sdhci_msm_runtime_suepend/resume.
> ---
> drivers/mmc/host/sdhci-msm.c | 41 +++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 39 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index c3a160c..fcff3e8 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -2159,9 +2159,46 @@ static __maybe_unused int sdhci_msm_runtime_resume(struct device *dev)
> return 0;
> }
>
> +static int sdhci_msm_suspend(struct device *dev)
> +{
> + struct sdhci_host *host = dev_get_drvdata(dev);
> + int ret;
> +
> + if (host->mmc->caps2 & MMC_CAP2_CQE) {
> + ret = cqhci_suspend(host->mmc);
> + if (ret)
> + return ret;
> + }
> +
> + ret = sdhci_suspend_host(host);
> + if (ret)
> + return ret;
goto resume_cqhci;
> +
> + return pm_runtime_force_suspend(dev);
Ideally there should be an error path e.g.
ret = pm_runtime_force_suspend(dev);
if (!ret)
return ret;
sdhci_resume_host()
resume_cqhci:
cqhci_resume()
return ret;
> +}
> +
> +static int sdhci_msm_resume(struct device *dev)
> +{
> + struct sdhci_host *host = dev_get_drvdata(dev);
> + int ret;
> +
> + ret = pm_runtime_force_resume(dev);
> + if (ret)
> + return ret;
> +
> + ret = sdhci_resume_host(host);
> + if (ret < 0)
> + return ret;
> +
> + if (host->mmc->caps2 & MMC_CAP2_CQE)
> + ret = cqhci_resume(host->mmc);
> +
> + return ret;
> +}
> +
> static const struct dev_pm_ops sdhci_msm_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> - pm_runtime_force_resume)
> + SET_SYSTEM_SLEEP_PM_OPS(sdhci_msm_suspend,
> + sdhci_msm_resume)
> SET_RUNTIME_PM_OPS(sdhci_msm_runtime_suspend,
> sdhci_msm_runtime_resume,
> NULL)
>
Powered by blists - more mailing lists