From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-mmc@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Douglas Anderson <dianders@chromium.org>,
Matthias Kaehlcke <mka@chromium.org>
Cc: Shawn Lin <shawn.lin@rock-chips.com>,
Jaehoon Chung <jh80.chung@samsung.com>,
Yong Mao <yong.mao@mediatek.com>,
Chaotian Jing <chaotian.jing@mediatek.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 02/11] mmc: dw_mmc: Re-store SDIO IRQs mask at system resume
Date: Sun, 8 Sep 2019 12:12:27 +0200 [thread overview]
Message-ID: <20190908101236.2802-3-ulf.hansson@linaro.org> (raw)
In-Reply-To: <20190908101236.2802-1-ulf.hansson@linaro.org>
In cases when SDIO IRQs have been enabled, runtime suspend is prevented by
the driver. However, this still means dw_mci_runtime_suspend|resume() gets
called during system suspend/resume, via pm_runtime_force_suspend|resume().
This means during system suspend/resume, the register context of the dw_mmc
device most likely loses its register context, even in cases when SDIO IRQs
have been enabled.
To re-enable the SDIO IRQs during system resume, the dw_mmc driver
currently relies on the mmc core to re-enable the SDIO IRQs when it resumes
the SDIO card, but this isn't the recommended solution. Instead, it's
better to deal with this locally in the dw_mmc driver, so let's do that.
Tested-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
drivers/mmc/host/dw_mmc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index eea52e2c5a0c..79c55c7b4afd 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -3460,6 +3460,10 @@ int dw_mci_runtime_resume(struct device *dev)
/* Force setup bus to guarantee available clock output */
dw_mci_setup_bus(host->slot, true);
+ /* Re-enable SDIO interrupts. */
+ if (sdio_irq_claimed(host->slot->mmc))
+ __dw_mci_enable_sdio_irq(host->slot, 1);
+
/* Now that slots are all setup, we can enable card detect */
dw_mci_enable_cd(host);
--
2.17.1
next prev parent reply other threads:[~2019-09-08 10:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-08 10:12 [PATCH v2 00/11] mmc: core: PM fixes/improvements for SDIO IRQs Ulf Hansson
2019-09-08 10:12 ` [PATCH v2 01/11] mmc: core: Add helper function to indicate if SDIO IRQs is enabled Ulf Hansson
2019-09-09 22:32 ` Doug Anderson
2019-09-08 10:12 ` Ulf Hansson [this message]
2019-09-09 22:32 ` [PATCH v2 02/11] mmc: dw_mmc: Re-store SDIO IRQs mask at system resume Doug Anderson
2019-09-08 10:12 ` [PATCH v2 03/11] mmc: mtk-sd: " Ulf Hansson
2019-09-09 22:29 ` Doug Anderson
2019-09-11 12:06 ` Ulf Hansson
2019-09-08 10:12 ` [PATCH v2 04/11] mmc: core: Move code to get pending SDIO IRQs to a function Ulf Hansson
2019-09-09 22:32 ` Doug Anderson
2019-09-08 10:12 ` [PATCH v2 05/11] mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD Ulf Hansson
2019-09-09 22:33 ` Doug Anderson
2019-09-08 10:12 ` [PATCH v2 06/11] mmc: core: Clarify that the ->ack_sdio_irq() callback is mandatory Ulf Hansson
2019-09-09 22:34 ` Doug Anderson
2019-09-08 10:12 ` [PATCH v2 07/11] mmc: core: WARN if SDIO IRQs are enabled for non-powered card in suspend Ulf Hansson
2019-09-08 10:12 ` [PATCH v2 08/11] mmc: core: Fixup processing of SDIO IRQs during system suspend/resume Ulf Hansson
2019-09-09 22:34 ` Doug Anderson
2019-09-08 10:12 ` [PATCH v2 09/11] mmc: sdhci: Drop redundant check in sdhci_ack_sdio_irq() Ulf Hansson
2019-09-09 11:19 ` Adrian Hunter
2019-09-08 10:12 ` [PATCH v2 10/11] mmc: sdhci: Drop redundant code for SDIO IRQs Ulf Hansson
2019-09-08 10:12 ` [PATCH v2 11/11] mmc: sdhci: Convert to use sdio_irq_claimed() Ulf Hansson
2019-09-11 14:21 ` [PATCH v2 00/11] mmc: core: PM fixes/improvements for SDIO IRQs 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=20190908101236.2802-3-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=adrian.hunter@intel.com \
--cc=chaotian.jing@mediatek.com \
--cc=dianders@chromium.org \
--cc=jh80.chung@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mka@chromium.org \
--cc=shawn.lin@rock-chips.com \
--cc=yong.mao@mediatek.com \
/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).