| Message ID | 8742c73168b7be3fb8dd841e57656bcbc4fa2e06.camel@HansenPartnership.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] SCSI fixes for 6.4-rc1 | expand |
The pull request you sent on Sat, 13 May 2023 19:24:24 -0400:
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/046206bad0f6a886e1f890c5fcb106d596971c95
Thank you!
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 17d7bb875fee..45fd374fe56c 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -9459,8 +9459,16 @@ static int __ufshcd_wl_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) * that performance might be impacted. */ ret = ufshcd_urgent_bkops(hba); - if (ret) + if (ret) { + /* + * If return err in suspend flow, IO will hang. + * Trigger error handler and break suspend for + * error recovery. + */ + ufshcd_force_error_recovery(hba); + ret = -EBUSY; goto enable_scaling; + } } else { /* make sure that auto bkops is disabled */ ufshcd_disable_auto_bkops(hba);
Single small fix for the UFS driver to fix a power management failure. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes The short changelog is: Keoseong Park (1): scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend And the diffstat: drivers/ufs/core/ufshcd.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) With full diff below. James ---