From: Peter Wang <peter.wang@mediatek.com>
Date: Fri, 12 Jul 2024 09:45:06 +0000 (+0800)
Subject: scsi: ufs: core: Bypass quick recovery if force reset is needed
X-Git-Tag: v6.11-rc2~11^2^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=022587d8aec3da1d1698ddae9fb8cfe35f3ad49c;p=thirdparty%2Flinux.git

scsi: ufs: core: Bypass quick recovery if force reset is needed

If force_reset is true, bypass quick recovery.  This will shorten error
recovery time.

Signed-off-by: Peter Wang <peter.wang@mediatek.com>
Link: https://lore.kernel.org/r/20240712094506.11284-1-peter.wang@mediatek.com
Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 480be64acf247..6ecaa7d8fa43c 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -6561,7 +6561,8 @@ again:
 	if (ufshcd_err_handling_should_stop(hba))
 		goto skip_err_handling;
 
-	if (hba->dev_quirks & UFS_DEVICE_QUIRK_RECOVERY_FROM_DL_NAC_ERRORS) {
+	if ((hba->dev_quirks & UFS_DEVICE_QUIRK_RECOVERY_FROM_DL_NAC_ERRORS) &&
+	    !hba->force_reset) {
 		bool ret;
 
 		spin_unlock_irqrestore(hba->host->host_lock, flags);