From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 16 Jun 2023 20:42:21 +0000 (+0200)
Subject: mmc: mmci: Stash status while waiting for busy
X-Git-Tag: v6.5-rc1~168^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a6a9e79720a51f40835a8a7dc94cf02a58f0600;p=thirdparty%2Flinux.git

mmc: mmci: Stash status while waiting for busy

Some interesting flags can arrive while we are waiting for
the first busy detect IRQ so OR then onto the stashed
flags so they are not missed.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230405-pl180-busydetect-fix-v7-3-69a7164f2a61@linaro.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index a3713e9a0ef4e..93981046eb88f 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -713,6 +713,7 @@ static bool ux500_busy_complete(struct mmci_host *host, u32 status, u32 err_msk)
 	 */
 	if (host->busy_status &&
 	    (status & host->variant->busy_detect_flag)) {
+		host->busy_status |= status & (MCI_CMDSENT | MCI_CMDRESPEND);
 		writel(host->variant->busy_detect_mask, base + MMCICLEAR);
 		return false;
 	}