Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20d3656b authored by Venkat Gopalakrishnan's avatar Venkat Gopalakrishnan Committed by Can Guo
Browse files

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: default avatarVenkat Gopalakrishnan <venkatg@codeaurora.org>
[cang@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
parent de3ecd1e

drivers/scsi/ufs/ufshcd.c

+7 −7
Original line number Diff line number Diff line
@@ -8079,13 +8079,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,
@@ -8112,6 +8105,13 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) 
		pm_runtime_put_sync(hba->dev);

	}



	/*

	 * 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