From: Ulf Hansson <ulf.hansson@linaro.org>
To: Shaik Sajida Bhanu <sbhanu@codeaurora.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>,
Rob Herring <robh+dt@kernel.org>,
Matthias Kaehlcke <mka@chromium.org>,
Asutosh Das <asutoshd@codeaurora.org>,
Stephen Boyd <swboyd@chromium.org>,
Sahitya Tummala <stummala@codeaurora.org>,
Sayali Lokhande <sayalil@codeaurora.org>,
cang@codeaurora.org,
Veerabhadrarao Badiganti <vbadigan@codeaurora.org>,
Ram Prakash Gupta <rampraka@codeaurora.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
DTML <devicetree@vger.kernel.org>, Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>
Subject: Re: [PATCH V4] mmc: sdhci-msm: Update system suspend/resume callbacks of sdhci-msm platform driver
Date: Wed, 4 Mar 2020 16:34:29 +0100 [thread overview]
Message-ID: <CAPDyKFqSJ4h7UvQfQzWmSq9gg97A0MXvdcuXXaY7b-YUHs=V2g@mail.gmail.com> (raw)
In-Reply-To: <1582181100-29914-1-git-send-email-sbhanu@codeaurora.org>
On Thu, 20 Feb 2020 at 07:45, Shaik Sajida Bhanu <sbhanu@codeaurora.org> 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>
> Reviewed-by: Stephen Boyd <swboyd@chromium.org>
> ---
> Changes since V3:
> Invoking sdhci & cqhci resume if sdhci_host_suspend fails.
> Removed condition check before invoking cqhci_resume since its a dummy function.
>
> 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 | 47 ++++++++++++++++++++++++++++++++++++++++++--
> 1 file changed, 45 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index 3955fa5d..3559b50 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -2159,9 +2159,52 @@ 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)
> + goto resume_cqhci;
sdhci_suspend_host() can't be called on a device that has been runtime
suspended, as that would lead to accessing device registers when
clocks/PM domains are gated.
Depending on how the corresponding cqhci device is managed from a
runtime PM point of view, it could also be problematic to call
cqhci_suspend().
> +
> + ret = pm_runtime_force_suspend(dev);
It looks to me that perhaps you could make use of solely
pm_runtime_force_suspend(), then just skip calling
sdhci_suspend|resume_host() altogether. Do you think that could work?
And vice versa for sdhci_msm_resume(), of course.
> + if (!ret)
> + return ret;
> +
> + sdhci_resume_host(host);
> +
> +resume_cqhci:
> + cqhci_resume(host->mmc);
> + 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;
> +
> + 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
>
Kind regards
Uffe
next prev parent reply other threads:[~2020-03-04 15:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-20 6:45 [PATCH V4] mmc: sdhci-msm: Update system suspend/resume callbacks of sdhci-msm platform driver Shaik Sajida Bhanu
2020-02-27 14:30 ` Veerabhadrarao Badiganti
2020-03-04 15:34 ` Ulf Hansson [this message]
[not found] ` <158334039680.7173.16159724456027777605@swboyd.mtv.corp.google.com>
2020-03-05 13:56 ` Veerabhadrarao Badiganti
2020-03-06 10:07 ` Ulf Hansson
[not found] ` <158463974696.152100.8345578995373250448@swboyd.mtv.corp.google.com>
2020-03-20 10:22 ` Ulf Hansson
[not found] ` <158690616084.105027.4255268086188981149@swboyd.mtv.corp.google.com>
2020-04-20 9:29 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPDyKFqSJ4h7UvQfQzWmSq9gg97A0MXvdcuXXaY7b-YUHs=V2g@mail.gmail.com' \
--to=ulf.hansson@linaro.org \
--cc=adrian.hunter@intel.com \
--cc=agross@kernel.org \
--cc=asutoshd@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=cang@codeaurora.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mka@chromium.org \
--cc=rampraka@codeaurora.org \
--cc=robh+dt@kernel.org \
--cc=sayalil@codeaurora.org \
--cc=sbhanu@codeaurora.org \
--cc=stummala@codeaurora.org \
--cc=swboyd@chromium.org \
--cc=vbadigan@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).