From: Haibo Chen <haibo.chen@nxp.com>
To: adrian.hunter@intel.com, ulf.hansson@linaro.org, dongas86@gmail.com
Cc: linux-mmc@vger.kernel.org, aisheng.dong@nxp.com, haibo.chen@nxp.com
Subject: [PATCH] mmc: sdhci-esdhc-imx: make sure usdhc clock enabled while doing suspend
Date: Tue, 18 Oct 2016 15:39:00 +0800 [thread overview]
Message-ID: <1476776340-23718-1-git-send-email-haibo.chen@nxp.com> (raw)
When suspend usdhc, it will access usdhc register. So usdhc clock
should be enabled, otherwise the access usdhc register will return
error or cause system hung.
Take this into consideration, if system enable a usdhc and do not
connect any SD/SDIO/MMC card, after system boot up, this usdhc
will do runtime suspend, and close all usdhc clock. At this time,
if suspend the system, due to no card persent, usdhc runtime resume
will not be called. So usdhc clock still closed, then in suspend,
once access usdhc register, system hung or bus error return.
This patch make sure usdhc clock always enabled while doing usdhc
suspend.
Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
---
drivers/mmc/host/sdhci-esdhc-imx.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 7123ef9..1df3846 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1322,17 +1322,28 @@ static int sdhci_esdhc_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
+#ifdef CONFIG_PM
+ pm_runtime_get_sync(host->mmc->parent);
+#endif
+
return sdhci_suspend_host(host);
}
static int sdhci_esdhc_resume(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
+ int ret;
/* re-initialize hw state in case it's lost in low power mode */
sdhci_esdhc_imx_hwinit(host);
+ ret = sdhci_resume_host(host);
- return sdhci_resume_host(host);
+#ifdef CONFIG_PM
+ pm_runtime_mark_last_busy(host->mmc->parent);
+ pm_runtime_put_autosuspend(host->mmc->parent);
+#endif
+
+ return ret;
}
#endif
--
1.9.1
next reply other threads:[~2016-10-18 16:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-18 7:39 Haibo Chen [this message]
2016-10-18 9:18 ` [PATCH] mmc: sdhci-esdhc-imx: make sure usdhc clock enabled while doing suspend Ulf Hansson
2016-10-19 9:18 ` Dong Aisheng
2016-10-20 10:21 ` Bough Chen
2016-10-22 1:07 ` Dong Aisheng
2016-10-21 7:42 ` Ulf Hansson
2016-10-22 1:06 ` Dong Aisheng
2016-10-19 9:23 ` Dong Aisheng
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=1476776340-23718-1-git-send-email-haibo.chen@nxp.com \
--to=haibo.chen@nxp.com \
--cc=adrian.hunter@intel.com \
--cc=aisheng.dong@nxp.com \
--cc=dongas86@gmail.com \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.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