diff options
| author | Peter Wang <peter.wang@mediatek.com> | 2024-03-29 09:50:36 +0800 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2024-04-01 21:24:16 -0400 |
| commit | 6bc5e70b1c792b31b497e48b4668a9a2909aca0d (patch) | |
| tree | 260562f6efc58c41c0581eec297734becf7eff73 /drivers | |
| parent | 1197c5b2099f716b3de327437fb50900a0b936c9 (diff) | |
| download | linux-stable-6bc5e70b1c792b31b497e48b4668a9a2909aca0d.tar.gz linux-stable-6bc5e70b1c792b31b497e48b4668a9a2909aca0d.tar.bz2 linux-stable-6bc5e70b1c792b31b497e48b4668a9a2909aca0d.zip | |
scsi: ufs: core: WLUN suspend dev/link state error recovery
When wl suspend error occurs, for example BKOP or SSU timeout, the host
triggers an error handler and returns -EBUSY to break the wl suspend
process. However, it is possible for the runtime PM to enter wl suspend
again before the error handler has finished, and return -EINVAL because the
device is in an error state. To address this, ensure that the rumtime PM
waits for the error handler to finish, or trigger the error handler in such
cases, because returning -EINVAL can cause the I/O to hang.
Signed-off-by: Peter Wang <peter.wang@mediatek.com>
Link: https://lore.kernel.org/r/20240329015036.15707-1-peter.wang@mediatek.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ufs/core/ufshcd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index e30fd125988d..292b06f361a2 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -9791,7 +9791,10 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) /* UFS device & link must be active before we enter in this function */ if (!ufshcd_is_ufs_dev_active(hba) || !ufshcd_is_link_active(hba)) { - ret = -EINVAL; + /* Wait err handler finish or trigger err recovery */ + if (!ufshcd_eh_in_progress(hba)) + ufshcd_force_error_recovery(hba); + ret = -EBUSY; goto enable_scaling; } |