Commit e1a2485c authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

mmc: mmci: Break out error check in busy detect 



The busy detect callback for Ux500 checks for an error
in the status in the first if() clause. The only practical
reason is that if an error occurs, the if()-clause is not
executed, and the code falls through to the last
if()-clause if (host->busy_status) which will clear and
disable the irq. Make this explicit instead: it is easier
to read.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20230405-pl180-busydetect-fix-v7-4-69a7164f2a61@linaro.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8a6a9e79

drivers/mmc/host/mmci.c

+10 −1
Original line number Diff line number Diff line
@@ -675,6 +675,15 @@ static bool ux500_busy_complete(struct mmci_host *host, u32 status, u32 err_msk) 
{

	void __iomem *base = host->base;



	if (status & err_msk) {

		/* Stop any ongoing busy detection if an error occurs */

		writel(host->variant->busy_detect_mask, base + MMCICLEAR);

		writel(readl(base + MMCIMASK0) &

		       ~host->variant->busy_detect_mask, base + MMCIMASK0);

		host->busy_status = 0;

		return true;

	}



	/*

	 * Before unmasking for the busy end IRQ, confirm that the

	 * command was sent successfully. To keep track of having a
@@ -688,7 +697,7 @@ static bool ux500_busy_complete(struct mmci_host *host, u32 status, u32 err_msk) 
	 * while, to allow it to be set, but tests indicates that it

	 * isn't needed.

	 */

	if (!host->busy_status && !(status & err_msk)) {

	if (!host->busy_status) {

		status = readl(base + MMCISTATUS);

		if (status & host->variant->busy_detect_flag) {

			writel(readl(base + MMCIMASK0) |