From cb7145f652b4d06ab54885c04b2d0805664ee4c8 Mon Sep 17 00:00:00 2001 From: Venkat Gopalakrishnan Date: Wed, 8 Feb 2017 12:16:45 -0800 Subject: [PATCH] scsi: ufs: renable AH8 timer on reset Auto hibern8 timer will get reset as part of ufshcd_vops_full_reset(), so reenable the timer in ufshcd_probe_hba(). Change-Id: I8ff85a9fd02f4a6b527666654728c4146cb61f5e Signed-off-by: Venkat Gopalakrishnan --- drivers/scsi/ufs/ufshcd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index bf357b50e798..2776d4d97beb 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7292,13 +7292,6 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) if (ufshcd_scsi_add_wlus(hba)) goto out; - /* Enable auto hibern8 if supported, after full host and - * device initialization. - */ - if (ufshcd_is_auto_hibern8_supported(hba)) - ufshcd_set_auto_hibern8_timer(hba, - hba->hibern8_on_idle.delay_ms); - /* Initialize devfreq after UFS device is detected */ if (ufshcd_is_clkscaling_supported(hba)) { memcpy(&hba->clk_scaling.saved_pwr_info.info, @@ -7327,6 +7320,13 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) if (!hba->is_init_prefetch) hba->is_init_prefetch = true; + /* + * Enable auto hibern8 if supported, after full host and + * device initialization. + */ + if (ufshcd_is_auto_hibern8_supported(hba)) + ufshcd_set_auto_hibern8_timer(hba, + hba->hibern8_on_idle.delay_ms); out: /* * If we failed to initialize the device or the device is not