* [PATCH V3] mmc: sdhci-msm: Update system suspend/resume callbacks of sdhci-msm platform driver
@ 2020-02-12 7:31 Shaik Sajida Bhanu
2020-02-12 16:58 ` Stephen Boyd
2020-02-18 9:12 ` Adrian Hunter
0 siblings, 2 replies; 3+ messages in thread
From: Shaik Sajida Bhanu @ 2020-02-12 7:31 UTC (permalink / raw)
To: adrian.hunter, ulf.hansson, robh+dt, mka
Cc: asutoshd, swboyd, stummala, sayalil, cang, vbadigan, rampraka,
linux-mmc, linux-kernel, linux-arm-msm, devicetree, agross,
bjorn.andersson, Shaik Sajida Bhanu
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@codeaurora.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;
+
+ return pm_runtime_force_suspend(dev);
+}
+
+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)
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V3] mmc: sdhci-msm: Update system suspend/resume callbacks of sdhci-msm platform driver
2020-02-12 7:31 [PATCH V3] mmc: sdhci-msm: Update system suspend/resume callbacks of sdhci-msm platform driver Shaik Sajida Bhanu
@ 2020-02-12 16:58 ` Stephen Boyd
2020-02-18 9:12 ` Adrian Hunter
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Boyd @ 2020-02-12 16:58 UTC (permalink / raw)
To: Shaik Sajida Bhanu, adrian.hunter, mka, robh+dt, ulf.hansson
Cc: asutoshd, stummala, sayalil, cang, vbadigan, rampraka, linux-mmc,
linux-kernel, linux-arm-msm, devicetree, agross, bjorn.andersson,
Shaik Sajida Bhanu
Quoting Shaik Sajida Bhanu (2020-02-11 23:31:13)
> 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@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.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.
> ---
This triple dash should come right after the SoB line.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V3] mmc: sdhci-msm: Update system suspend/resume callbacks of sdhci-msm platform driver
2020-02-12 7:31 [PATCH V3] mmc: sdhci-msm: Update system suspend/resume callbacks of sdhci-msm platform driver Shaik Sajida Bhanu
2020-02-12 16:58 ` Stephen Boyd
@ 2020-02-18 9:12 ` Adrian Hunter
1 sibling, 0 replies; 3+ messages in thread
From: Adrian Hunter @ 2020-02-18 9:12 UTC (permalink / raw)
To: Shaik Sajida Bhanu, ulf.hansson, robh+dt, mka
Cc: asutoshd, swboyd, stummala, sayalil, cang, vbadigan, rampraka,
linux-mmc, linux-kernel, linux-arm-msm, devicetree, agross,
bjorn.andersson
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@codeaurora.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)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-18 9:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-12 7:31 [PATCH V3] mmc: sdhci-msm: Update system suspend/resume callbacks of sdhci-msm platform driver Shaik Sajida Bhanu
2020-02-12 16:58 ` Stephen Boyd
2020-02-18 9:12 ` Adrian Hunter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).