evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "scsi: ufs: gate ref_clk during aggressive clk gating""

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-05 19:29:27 -07:00 • committed by Gerrit - the friendly Code Review server
commit 7cfcfc9a09
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/scsi/ufs/ufs-qcom.c
View file

@ -1498,14 +1498,10 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,
/* M-PHY RMMI interface clocks can be turned off */
ufs_qcom_phy_disable_iface_clk(host->generic_phy);
/*
* If auto hibern8 is supported then the link will already
* be in hibern8 state and the ref clock can be gated.
*/
if (ufshcd_is_auto_hibern8_supported(hba) ||
!ufs_qcom_is_link_active(hba)) {
/* turn off UFS local PHY ref_clk */
ufs_qcom_phy_disable_ref_clk(host->generic_phy);
if (!ufs_qcom_is_link_active(hba)) {
if (!is_gating_context)
/* turn off UFS local PHY ref_clk */
ufs_qcom_phy_disable_ref_clk(host->generic_phy);
/* disable device ref_clk */
ufs_qcom_dev_ref_clk_ctrl(host, false);
}
@ -1960,6 +1956,13 @@ static int ufs_qcom_init(struct ufs_hba *hba)
host->hba = hba;
ufshcd_set_variant(hba, host);
/*
* voting/devoting device ref_clk source is time consuming hence
* skip devoting it during aggressive clock gating. This clock
* will still be gated off during runtime suspend.
*/
hba->no_ref_clk_gating = true;
err = ufs_qcom_ice_get_dev(host);
if (err == -EPROBE_DEFER) {
/*

7
drivers/scsi/ufs/ufshcd.c
View file

@ -1346,12 +1346,7 @@ static void ufshcd_gate_work(struct work_struct *work)
ufshcd_set_link_hibern8(hba);
}
/*
* If auto hibern8 is supported then the link will already
* be in hibern8 state and the ref clock can be gated.
*/
if ((ufshcd_is_auto_hibern8_supported(hba) ||
!ufshcd_is_link_active(hba)) && !hba->no_ref_clk_gating)
if (!ufshcd_is_link_active(hba) && !hba->no_ref_clk_gating)
ufshcd_disable_clocks(hba, true);
else
/* If link is active, device ref_clk can't be switched off */