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

Commit 085d3f00 authored by Subhash Jadavani's avatar Subhash Jadavani Committed by Todd Kjos
Browse files

FROMLIST: scsi: ufs: Fix up clock scaling 

In host reset and restore path, after hba is stopped but before it is
enabled back again, we scale up clocks to their max frequencies.
If clock scale notify vendor specific ops happens to have any operations
to hba, DME commands for example, it would fail due to hba is stopped at
this moment. This change introduces another func to explicitly set clock
frequency so that it can be used here and also in ufshcd_scale_clks().
Meanwhile, this change modifies the clock scaling preparation error out
path so that clock is released before it returns.

Bug: 143632303
Change-Id: Ic39cdb7a9a897b5cfa3f0c3462d411ed23203447
Link: https://lore.kernel.org/patchwork/patch/1147023/


Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
parent e05a35ea

drivers/scsi/ufs/ufshcd.c

+49 −25
Original line number Diff line number Diff line
@@ -903,28 +903,29 @@ static bool ufshcd_is_unipro_pa_params_tuning_req(struct ufs_hba *hba) 
		return false;

}



static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up)

/**

 * ufshcd_set_clk_freq - set UFS controller clock frequencies

 * @hba: per adapter instance

 * @scale_up: If True, set max possible frequency othewise set low frequency

 *

 * Returns 0 if successful

 * Returns < 0 for any other errors

 */

static int ufshcd_set_clk_freq(struct ufs_hba *hba, bool scale_up)

{

	int ret = 0;

	struct ufs_clk_info *clki;

	struct list_head *head = &hba->clk_list_head;

	ktime_t start = ktime_get();

	bool clk_state_changed = false;



	if (list_empty(head))

		goto out;



	ret = ufshcd_vops_clk_scale_notify(hba, scale_up, PRE_CHANGE);

	if (ret)

		return ret;



	list_for_each_entry(clki, head, list) {

		if (!IS_ERR_OR_NULL(clki->clk)) {

			if (scale_up && clki->max_freq) {

				if (clki->curr_freq == clki->max_freq)

					continue;



				clk_state_changed = true;

				ret = clk_set_rate(clki->clk, clki->max_freq);

				if (ret) {

					dev_err(hba->dev, "%s: %s clk set rate(%dHz) failed, %d\n",
@@ -943,7 +944,6 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up) 
				if (clki->curr_freq == clki->min_freq)

					continue;



				clk_state_changed = true;

				ret = clk_set_rate(clki->clk, clki->min_freq);

				if (ret) {

					dev_err(hba->dev, "%s: %s clk set rate(%dHz) failed, %d\n",
@@ -962,13 +962,36 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up) 
				clki->name, clk_get_rate(clki->clk));

	}



out:

	return ret;

}



/**

 * ufshcd_scale_clks - scale up or scale down UFS controller clocks

 * @hba: per adapter instance

 * @scale_up: True if scaling up and false if scaling down

 *

 * Returns 0 if successful

 * Returns < 0 for any other errors

 */

static int ufshcd_scale_clks(struct ufs_hba *hba, bool scale_up)

{

	int ret = 0;



	ret = ufshcd_vops_clk_scale_notify(hba, scale_up, PRE_CHANGE);

	if (ret)

		return ret;



	ret = ufshcd_set_clk_freq(hba, scale_up);

	if (ret)

		return ret;



	ret = ufshcd_vops_clk_scale_notify(hba, scale_up, POST_CHANGE);

	if (ret) {

		ufshcd_set_clk_freq(hba, !scale_up);

		return ret;

	}



out:

	if (clk_state_changed)

		trace_ufshcd_profile_clk_scaling(dev_name(hba->dev),

			(scale_up ? "up" : "down"),

			ktime_to_us(ktime_sub(ktime_get(), start)), ret);

	return ret;

}
@@ -1154,35 +1177,36 @@ static int ufshcd_devfreq_scale(struct ufs_hba *hba, bool scale_up) 


	ret = ufshcd_clock_scaling_prepare(hba);

	if (ret)

		return ret;

		goto out;



	/* scale down the gear before scaling down clocks */

	if (!scale_up) {

		ret = ufshcd_scale_gear(hba, false);

		if (ret)

			goto out;

			goto clk_scaling_unprepare;

	}



	ret = ufshcd_scale_clks(hba, scale_up);

	if (ret) {

		if (!scale_up)

			ufshcd_scale_gear(hba, true);

		goto out;

	}

	if (ret)

		goto scale_up_gear;



	/* scale up the gear after scaling up clocks */

	if (scale_up) {

		ret = ufshcd_scale_gear(hba, true);

		if (ret) {

			ufshcd_scale_clks(hba, false);

			goto out;

			goto clk_scaling_unprepare;

		}

	}



	ret = ufshcd_vops_clk_scale_notify(hba, scale_up, POST_CHANGE);

	goto clk_scaling_unprepare;



out:

scale_up_gear:

	if (!scale_up)

		ufshcd_scale_gear(hba, true);

clk_scaling_unprepare:

	ufshcd_clock_scaling_unprepare(hba);

out:

	ufshcd_release(hba);

	return ret;

}
@@ -6270,7 +6294,7 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba) 
	spin_unlock_irqrestore(hba->host->host_lock, flags);



	/* scale up clocks to max frequency before full reinitialization */

	ufshcd_scale_clks(hba, true);

	ufshcd_set_clk_freq(hba, true);



	err = ufshcd_hba_enable(hba);

	if (err)