mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 03:15:31 +09:00
Revert "FROMLIST: scsi: ufs: Fix deadlocks between power management and error handler"
This reverts commit f68d040c31.
Patch "scsi: ufs: core: Reduce the power mode change timeout" caused a
spike in the number of UFS suspend timeouts. Hence revert that change
and also later UFS driver changes.
Bug: b/246990788
Change-Id: Ic20594727d47dc6d9af9a320d64bd7011112e789
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
@@ -9337,13 +9337,16 @@ static int ufshcd_wl_suspend(struct device *dev)
|
||||
ktime_t start = ktime_get();
|
||||
|
||||
hba = shost_priv(sdev->host);
|
||||
down(&hba->host_sem);
|
||||
|
||||
if (pm_runtime_suspended(dev))
|
||||
goto out;
|
||||
|
||||
ret = __ufshcd_wl_suspend(hba, UFS_SYSTEM_PM);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
dev_err(&sdev->sdev_gendev, "%s failed: %d\n", __func__, ret);
|
||||
up(&hba->host_sem);
|
||||
}
|
||||
|
||||
out:
|
||||
if (!ret)
|
||||
@@ -9376,6 +9379,7 @@ out:
|
||||
hba->curr_dev_pwr_mode, hba->uic_link_state);
|
||||
if (!ret)
|
||||
hba->is_sys_suspended = false;
|
||||
up(&hba->host_sem);
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user