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

Commit 5c3481e0 authored by Can Guo's avatar Can Guo
Browse files

scsi: ufs: add checks before setting clk-gating states 



Clock gating features can be turned on/off selectively which means its
state information is only important if it is enabled. This change makes
sure that we only look at state of clk-gating if it is enabled.

Change-Id: I201cb65d4a9712ba7c0f7022d7323cdf6dc144c9
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
parent 24ed5bd0

drivers/scsi/ufs/ufshcd.c

+14 −3
Original line number Diff line number Diff line
@@ -1841,6 +1841,8 @@ static void ufshcd_init_clk_gating(struct ufs_hba *hba) 
	if (!ufshcd_is_clkgating_allowed(hba))

		return;



	hba->clk_gating.state = CLKS_ON;



	hba->clk_gating.delay_ms = 150;

	INIT_DELAYED_WORK(&hba->clk_gating.gate_work, ufshcd_gate_work);

	INIT_WORK(&hba->clk_gating.ungate_work, ufshcd_ungate_work);
@@ -2529,6 +2531,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 
		clear_bit_unlock(tag, &hba->lrb_in_use);

		goto out;

	}

	if (ufshcd_is_clkgating_allowed(hba))

		WARN_ON(hba->clk_gating.state != CLKS_ON);



	lrbp = &hba->lrb[tag];
@@ -8176,8 +8179,11 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op) 
		/* If link is active, device ref_clk can't be switched off */

		__ufshcd_setup_clocks(hba, false, true);



	if (ufshcd_is_clkgating_allowed(hba)) {

		hba->clk_gating.state = CLKS_OFF;

	trace_ufshcd_clk_gating(dev_name(hba->dev), hba->clk_gating.state);

		trace_ufshcd_clk_gating(dev_name(hba->dev),

					hba->clk_gating.state);

	}



	/* Put the host controller in low power mode if possible */

	ufshcd_hba_vreg_set_lpm(hba);
@@ -8315,6 +8321,11 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) 
	if (hba->clk_scaling.is_allowed)

		ufshcd_suspend_clkscaling(hba);

	ufshcd_setup_clocks(hba, false);

	if (ufshcd_is_clkgating_allowed(hba)) {

		hba->clk_gating.state = CLKS_OFF;

		trace_ufshcd_clk_gating(dev_name(hba->dev),

					hba->clk_gating.state);

	}

out:

	hba->pm_op_in_progress = 0;

	if (ret)