Merge "mmc: sdhci: Fix handling of ADMA error interrupt bit." (8d3221a9) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/mmc/host/cmdq_hci.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -925,6 +925,7 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		pr_err("%s: err: %d status: 0x%08x task-err-info (0x%08lx)\n",
		mmc_hostname(mmc), err, status, err_info);

		cmdq_dumpregs(cq_host);
		/*
		* Need to halt CQE in case of error in interrupt context itself
		* otherwise CQE may proceed with sending CMD to device even if
		@@ -936,7 +937,6 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		if (ret)
		pr_err("%s: %s: halt failed ret=%d\n",
		mmc_hostname(mmc), __func__, ret);

		/*
		* Clear the CQIS after halting incase of error. This is done
		* because if CQIS is cleared before halting, the CQ will
		@@ -947,8 +947,6 @@ irqreturn_t cmdq_irq(struct mmc_host *mmc, int err)
		*/
		cmdq_writel(cq_host, status, CQIS);

		cmdq_dumpregs(cq_host);

		if (!err_info) {
		/*
		* It may so happen sometimes for few errors(like ADMA)

+1 −1

Original line number	Diff line number	Diff line
		@@ -3378,7 +3378,7 @@ static int sdhci_get_data_err(struct sdhci_host *host, u32 intmask)
		} else if (intmask & (SDHCI_INT_DATA_END_BIT \| SDHCI_INT_DATA_CRC)) {
		host->mmc->err_stats[MMC_ERR_DAT_CRC]++;
		return -EILSEQ;
		} else if (intmask & MMC_ERR_ADMA) {
		} else if (intmask & SDHCI_INT_ADMA_ERROR) {
		host->mmc->err_stats[MMC_ERR_ADMA]++;
		return -EIO;
		}