diff options
| author | Bart Van Assche <bvanassche@google.com> | 2022-09-19 15:20:50 -0700 |
|---|---|---|
| committer | Bart Van Assche <bvanassche@google.com> | 2022-09-19 19:33:52 -0700 |
| commit | a6f610f1f1e6780ed576dfbf8e2649688cb2aba6 (patch) | |
| tree | 6a9ff65acc89d70a145223f9c29f88ac7bb05c67 | |
| parent | 63eb37070e60253a723dca830d41bd313beba800 (diff) | |
| download | common-android-gs-pantah-5.10-android13-qpr1-beta-3.tar.gz | |
Revert "UPSTREAM: scsi: ufs: core: Reduce the power mode change timeout"android-t-qpr1-beta-3_r0.5android-t-qpr1-beta-3_r0.4android-t-qpr1-beta-3_r0.3android-t-qpr1-beta-3.1_r0.1android-13.0.0_r0.50android-13.0.0_r0.49android-13.0.0_r0.48android-gs-raviole-5.10-android13-qpr1-beta-3android-gs-pantah-5.10-t-qpr1-beta-3android-gs-pantah-5.10-android13-qpr1-beta-3android-gs-bluejay-5.10-android13-qpr1-beta-3
This reverts commit 3d35c6b91d6d370ca5166efa990588ee43267721.
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: I5aae929f0598020dc5e7c440946eb0d2101b07cc
Signed-off-by: Bart Van Assche <bvanassche@google.com>
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 9ee325116902..45ee1adefc08 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -8826,8 +8826,6 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, struct scsi_device *sdp; unsigned long flags; int ret, retries; - unsigned long deadline; - int32_t remaining; spin_lock_irqsave(hba->host->host_lock, flags); sdp = hba->sdev_ufs_device; @@ -8860,14 +8858,9 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, * callbacks hence set the RQF_PM flag so that it doesn't resume the * already suspended childs. */ - deadline = jiffies + 10 * HZ; for (retries = 3; retries > 0; --retries) { - ret = -ETIMEDOUT; - remaining = deadline - jiffies; - if (remaining <= 0) - break; ret = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr, - remaining / HZ, 0, 0, RQF_PM, NULL); + START_STOP_TIMEOUT, 0, 0, RQF_PM, NULL); if (!scsi_status_is_check_condition(ret) || !scsi_sense_valid(&sshdr) || sshdr.sense_key != UNIT_ATTENTION) |