OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

scsi: ufs: Reduce the START STOP UNIT timeout 

Reduce the START STOP UNIT command timeout to one second since on Android
devices a kernel panic is triggered if an attempt to suspend the system
takes more than 20 seconds. One second should be enough for the START STOP
UNIT command since this command completes in less than a millisecond for
the UFS devices I have access to.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20221018202958.1902564-7-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2022-10-18 13:29:54 -07:00 committed by Martin K. Petersen
parent 836d322d73
commit dcd5b7637c
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/ufs/core/ufshcd.c
View File

@ -8746,8 +8746,6 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
struct scsi_device *sdp; struct scsi_device *sdp;
unsigned long flags; unsigned long flags;
int ret, retries; int ret, retries;
unsigned long deadline;
int32_t remaining;
spin_lock_irqsave(hba->host->host_lock, flags); spin_lock_irqsave(hba->host->host_lock, flags);
sdp = hba->ufs_device_wlun; sdp = hba->ufs_device_wlun;
@ -8775,14 +8773,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 * callbacks hence set the RQF_PM flag so that it doesn't resume the
* already suspended childs. * already suspended childs.
*/ */
deadline = jiffies + 10 * HZ;
for (retries = 3; retries > 0; --retries) { 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, ret = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr,
remaining / HZ, 0, 0, RQF_PM, NULL); HZ, 0, 0, RQF_PM, NULL);
if (!scsi_status_is_check_condition(ret) || if (!scsi_status_is_check_condition(ret) ||
!scsi_sense_valid(&sshdr) || !scsi_sense_valid(&sshdr) ||
sshdr.sense_key != UNIT_ATTENTION) sshdr.sense_key != UNIT_ATTENTION)