Merge "mmc: host: cmdq: Proceed with other interrupts if CQTCN is zero" (35aa3c53) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/mmc/host/cmdq_hci.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -1145,9 +1145,9 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		}

		if (err_inject && err == -ETIMEDOUT)
		goto out;
		goto hac;
		cmdq_finish_data(mmc, tag);
		goto out;
		goto hac;
		} else {
		cmdq_writel(cq_host, status, CQIS);
		}
		@@ -1156,7 +1156,7 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		/* read CQTCN and complete the request */
		comp_status = cmdq_readl(cq_host, CQTCN);
		if (!comp_status)
		goto out;
		goto hac;
		/*
		* The CQTCN must be cleared before notifying req completion
		* to upper layers to avoid missing completion notification
		@@ -1183,7 +1183,7 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		}
		}
		}

		hac:
		if (status & CQIS_HAC) {
		if (cq_host->ops->post_cqe_halt)
		cq_host->ops->post_cqe_halt(mmc);
		@@ -1194,7 +1194,6 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		complete(&cq_host->halt_comp);
		}

		out:
		return IRQ_HANDLED;
		}
		EXPORT_SYMBOL(cmdq_irq);