[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1650961818-13452-1-git-send-email-quic_spathi@quicinc.com>
Date: Tue, 26 Apr 2022 14:00:18 +0530
From: Srinivasarao Pathipati <quic_spathi@...cinc.com>
To: ulf.hansson@...aro.org, adrian.hunter@...el.com,
riteshh@...eaurora.org, asutoshd@...eaurora.org, axboe@...nel.dk,
avri.altman@....com, kch@...dia.com, CLoehle@...erstone.com,
swboyd@...omium.org, digetx@...il.com, bigeasy@...utronix.de,
linux-mmc@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Shaik Sajida Bhanu <sbhanu@...eaurora.org>,
kamasali <quic_kamasali@...cinc.com>,
Srinivasarao Pathipati <quic_spathi@...cinc.com>
Subject: [PATCH V1] mmc: core: Enable force hw reset
From: Shaik Sajida Bhanu <sbhanu@...eaurora.org>
During error recovery set need hw reset to handle
ICE error where cqe reset is must.
Signed-off-by: Shaik Sajida Bhanu <sbhanu@...eaurora.org>
Signed-off-by: kamasali <quic_kamasali@...cinc.com>
Signed-off-by: Srinivasarao Pathipati <quic_spathi@...cinc.com>
---
drivers/mmc/core/block.c | 8 +++++---
drivers/mmc/host/cqhci-core.c | 7 +++++--
include/linux/mmc/host.h | 1 +
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index b35e7a9..f63bf33 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1482,10 +1482,12 @@ void mmc_blk_cqe_recovery(struct mmc_queue *mq)
pr_debug("%s: CQE recovery start\n", mmc_hostname(host));
err = mmc_cqe_recovery(host);
- if (err)
+ if (err || host->need_hw_reset) {
mmc_blk_reset(mq->blkdata, host, MMC_BLK_CQE_RECOVERY);
- else
- mmc_blk_reset_success(mq->blkdata, MMC_BLK_CQE_RECOVERY);
+ if (host->need_hw_reset)
+ host->need_hw_reset = false;
+ }
+ mmc_blk_reset_success(mq->blkdata, MMC_BLK_CQE_RECOVERY);
pr_debug("%s: CQE recovery done\n", mmc_hostname(host));
}
diff --git a/drivers/mmc/host/cqhci-core.c b/drivers/mmc/host/cqhci-core.c
index b0d30c3..311b510 100644
--- a/drivers/mmc/host/cqhci-core.c
+++ b/drivers/mmc/host/cqhci-core.c
@@ -812,18 +812,21 @@ static void cqhci_finish_mrq(struct mmc_host *mmc, unsigned int tag)
irqreturn_t cqhci_irq(struct mmc_host *mmc, u32 intmask, int cmd_error,
int data_error)
{
- u32 status;
+ u32 status, ice_err;
unsigned long tag = 0, comp_status;
struct cqhci_host *cq_host = mmc->cqe_private;
status = cqhci_readl(cq_host, CQHCI_IS);
cqhci_writel(cq_host, status, CQHCI_IS);
+ ice_err = status & (CQHCI_IS_GCE | CQHCI_IS_ICCE);
pr_debug("%s: cqhci: IRQ status: 0x%08x\n", mmc_hostname(mmc), status);
if ((status & (CQHCI_IS_RED | CQHCI_IS_GCE | CQHCI_IS_ICCE)) ||
- cmd_error || data_error)
+ cmd_error || data_error || ice_err){
+ mmc->need_hw_reset = true;
cqhci_error_irq(mmc, status, cmd_error, data_error);
+ }
if (status & CQHCI_IS_TCC) {
/* read TCN and complete the request */
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index c193c50..3d00bcf 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -492,6 +492,7 @@ struct mmc_host {
int cqe_qdepth;
bool cqe_enabled;
bool cqe_on;
+ bool need_hw_reset;
/* Inline encryption support */
#ifdef CONFIG_MMC_CRYPTO
--
2.7.4
Powered by blists - more mailing lists