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

[ Upstream commit 022587d8ae ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Peter Wang 2024-07-12 17:45:06 +08:00 committed by Greg Kroah-Hartman
parent 8d1af5c6af
commit 02c19d769d

View File

@ -6467,7 +6467,8 @@ again:
if (ufshcd_err_handling_should_stop(hba)) if (ufshcd_err_handling_should_stop(hba))
goto skip_err_handling; 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; bool ret;
spin_unlock_irqrestore(hba->host->host_lock, flags); spin_unlock_irqrestore(hba->host->host_lock, flags);