blob: 032d0b790c816f746317a81696516628255e3e3e [file] [log] [blame]
From fea8eec16eeb137b7221ef4e5cd136ab7474e48d Mon Sep 17 00:00:00 2001
From: Ulf Hansson <>
Date: Tue, 19 May 2020 17:24:34 +0200
Subject: [PATCH] mmc: tmio: Further fixup runtime PM management at remove
commit 4bd784411aca022622e484eb262f5a0540ae732c upstream.
Before calling tmio_mmc_host_probe(), the caller is required to enable
clocks for its device, as to make it accessible when reading/writing
registers during probe.
Therefore, the responsibility to disable these clocks, in the error path of
->probe() and during ->remove(), is better managed outside
tmio_mmc_host_remove(). As a matter of fact, callers of
tmio_mmc_host_remove() already expects this to be the behaviour.
However, there's a problem with tmio_mmc_host_remove() when the Kconfig
option, CONFIG_PM, is set. More precisely, tmio_mmc_host_remove() may then
disable the clock via runtime PM, which leads to clock enable/disable
imbalance problems, when the caller of tmio_mmc_host_remove() also tries to
disable the same clocks.
To solve the problem, let's make sure tmio_mmc_host_remove() leaves the
device with clocks enabled, but also make sure to disable the IRQs, as we
normally do at ->runtime_suspend().
Reported-by: Geert Uytterhoeven <>
Reviewed-by: Wolfram Sang <>
Tested-by: Wolfram Sang <>
Signed-off-by: Ulf Hansson <>
Tested-by: Geert Uytterhoeven <>
Signed-off-by: Paul Gortmaker <>
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index 0c5d040d194c..5c7869f4fc3d 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1295,12 +1295,14 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
+ tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL);
- pm_runtime_dont_use_autosuspend(&pdev->dev);
if (host->native_hotplug)
- pm_runtime_put_sync(&pdev->dev);
+ pm_runtime_dont_use_autosuspend(&pdev->dev);
+ pm_runtime_put_noidle(&pdev->dev);