From c40dacbca21f6ae97a83fa0276de7a6474c8fba3 Mon Sep 17 00:00:00 2001 From: Sarthak Garg Date: Fri, 3 Jun 2022 10:45:32 +0530 Subject: [PATCH] FROMLIST: mmc: core: Introduce new flag to force hardware reset Introduce new flag cqe_recovery_reset_always to allow vendors to force hardware reset during cqe recovery. Bug: 231672697 Link: https://lore.kernel.org/lkml/20220603051534.22672-2-quic_sartgarg@quicinc.com/ Signed-off-by: Sarthak Garg Acked-by: Adrian Hunter Change-Id: I929bc634a1712c18f26652ae3d7166b7c8b7f7a9 --- drivers/mmc/core/block.c | 2 +- include/linux/mmc/host.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index d563de3d3ef7..164339e22685 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -1484,7 +1484,7 @@ 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->cqe_recovery_reset_always) mmc_blk_reset(mq->blkdata, host, MMC_BLK_CQE_RECOVERY); mmc_blk_reset_success(mq->blkdata, MMC_BLK_CQE_RECOVERY); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 09938a9ff123..d034df740796 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -521,6 +521,7 @@ struct mmc_host { int cqe_qdepth; bool cqe_enabled; bool cqe_on; + bool cqe_recovery_reset_always; /* Inline encryption support */ #ifdef CONFIG_MMC_CRYPTO