mmc: core: Further prevent card detect during shutdown

commit 87a0d90fcd31c0f36da0332428c9e1a1e0f97432 upstream.

Disabling card detect from the host's ->shutdown_pre() callback turned out
to not be the complete solution. More precisely, beyond the point when the
mmc_bus->shutdown() has been called, to gracefully power off the card, we
need to prevent card detect. Otherwise the mmc_rescan work may poll for the
card with a CMD13, to see if it's still alive, which then will fail and
hang as the card has already been powered off.

To fix this problem, let's disable mmc_rescan prior to power off the card
during shutdown.

Reported-by: Anthony Pighin <anthony.pighin@nokia.com>
Fixes: 66c915d09b94 ("mmc: core: Disable card detect during shutdown")
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Closes: https://lore.kernel.org/all/BN0PR08MB695133000AF116F04C3A9FFE83212@BN0PR08MB6951.namprd08.prod.outlook.com/
Tested-by: Anthony Pighin <anthony.pighin@nokia.com>
Message-ID: <20241125122446.18684-1-ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index f6b7a9c5bbffd23ce5bc265a4a208a5b3b728bab..c25c58473a91acb2e49473972f8f6bed6cfc9f60 100644 (file)
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -158,6 +158,8 @@ static void mmc_bus_shutdown(struct device *dev)
        if (dev->driver && drv->shutdown)
                drv->shutdown(card);
 
+       __mmc_stop_host(host);
+
        if (host->bus_ops->shutdown) {
                ret = host->bus_ops->shutdown(host);
                if (ret)

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index a6dcc68d68eec129b3908974f5e0b3eb757bdde3..c3f95c5015d9b11db6f5c57f2ac47dee3d743dfb 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -2282,6 +2282,9 @@ void mmc_start_host(struct mmc_host *host)
 
 void __mmc_stop_host(struct mmc_host *host)
 {
+       if (host->rescan_disable)
+               return;
+
        if (host->slot.cd_irq >= 0) {
                mmc_gpio_set_cd_wake(host, false);
                disable_irq(host->slot.cd_irq);