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

Commit 42ff9205 authored by Can Guo's avatar Can Guo Committed by Todd Kjos
Browse files

FROMGIT: scsi: ufs: Add checks before setting clk-gating states 

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

Link: https://lore.kernel.org/r/1596975355-39813-2-git-send-email-cang@codeaurora.org


Reviewed-by: default avatarAvri Altman <avri.altman@wdc.com>
Reviewed-by: default avatarHongwu Su <hongwus@codeaurora.org>
Reviewed-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>

Bug: 165343119
(cherry picked from commit 2dec9475a4028ba0a4ede51452f89dead2c008e1
https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git

 5.10/scsi-queue)
Change-Id: Ie1f582658d27935891236cad3fb23c018240a15b
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
parent f58c4d27

drivers/scsi/ufs/ufshcd.c

+14 −3
Original line number Diff line number Diff line
@@ -1897,6 +1897,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);
@@ -2589,7 +2591,8 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 
		clear_bit_unlock(tag, &hba->lrb_in_use);

		goto out;

	}

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

	WARN_ON(ufshcd_is_clkgating_allowed(hba) &&

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



	lrbp = &hba->lrb[tag];
@@ -8521,8 +8524,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);
@@ -8672,6 +8678,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)