diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-11 14:09:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 13:13:57 +0200 |
| commit | 9eff1ebe2c90fce4030d1deaef6f1bd433d99eaa (patch) | |
| tree | 6cc6eca01b8404e211c7a5bc8a8b63fec367d211 /drivers/mmc | |
| parent | c5f89ff633d2aa2b20072969dcfdf4af960d1eba (diff) | |
| download | linux-stable-9eff1ebe2c90fce4030d1deaef6f1bd433d99eaa.tar.gz linux-stable-9eff1ebe2c90fce4030d1deaef6f1bd433d99eaa.tar.bz2 linux-stable-9eff1ebe2c90fce4030d1deaef6f1bd433d99eaa.zip | |
mmc: mtk-sd: Re-store SDIO IRQs mask at system resume
[ Upstream commit 1c81d69d4c98aab56c5a7d5a810f84aefdb37e9b ]
In cases when SDIO IRQs have been enabled, runtime suspend is prevented by
the driver. However, this still means msdc_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 mtk-sd
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 mtk-sd 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 mtk-sd driver, so let's do that.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/mtk-sd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 33f4b6387ef7..978c8ccce7e3 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -2421,6 +2421,9 @@ static void msdc_restore_reg(struct msdc_host *host) } else { writel(host->save_para.pad_tune, host->base + tune_reg); } + + if (sdio_irq_claimed(host->mmc)) + __msdc_enable_sdio_irq(host, 1); } static int msdc_runtime_suspend(struct device *dev) |