From 8a8707051bea66b730d73bfbe9fa7ba9e23f43cd Mon Sep 17 00:00:00 2001 From: JaeHun Jung Date: Fri, 19 Jul 2019 17:07:59 +0900 Subject: [PATCH] [RAMEN9610-20756][RAMEN9610-18204][COMMON] scsi: ufs: Change timeout for start_stop from 60s to 5s Watchdog is 26s. 60s is too long in mobile device. So, Change it. Change-Id: Ic874ce9dca62649e9d33d25ee6251cc123e2001d Signed-off-by: JaeHun Jung Signed-off-by: Kim Gunho --- drivers/scsi/ufs/ufshcd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 95aecf8fced3..ae07c33c2180 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7830,8 +7830,10 @@ 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. */ + pr_info("%s %d\n", __func__, __LINE__); ret = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr, - START_STOP_TIMEOUT, 0, 0, RQF_PM, NULL); + (5 * HZ), 0, 0, RQF_PM, NULL); + pr_info("%s %d\n", __func__, __LINE__); if (ret) { sdev_printk(KERN_WARNING, sdp, "START_STOP failed for power mode: %d, result %x\n", @@ -8164,9 +8166,7 @@ enable_gating: ufshcd_release(hba); out: hba->pm_op_in_progress = 0; - - if (hba->monitor.flag & UFSHCD_MONITOR_LEVEL1) - dev_info(hba->dev, "UFS suspend done\n"); + dev_info(hba->dev, "UFS suspend done\n"); return ret; } -- 2.20.1