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

Commit 94786384 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Can Guo
Browse files

scsi: ufs: Extract devfreq registration 



Failing to register with devfreq leaves hba->devfreq assigned, which causes
the error path to dereference the ERR_PTR(). Rather than bolting on more
conditionals, move the call of devm_devfreq_add_device() into it's own
function and only update hba->devfreq once it's successfully registered.

The subsequent patch builds upon this to make UFS actually work again, as
it's been broken since f1d981eaecf8 ("PM / devfreq: Use the available
min/max frequency")

Also switch to use DEVFREQ_GOV_SIMPLE_ONDEMAND constant.

Change-Id: I36ba711ec1bd169559999729ec897e1761fad2c8
Reviewed-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Git-commit: deac444f4e44c406796a086381db1c09c70ce042
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git


[cang@codeaurora.org: resolved trivial merge conflicts]
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
parent c8be6380

drivers/scsi/ufs/ufshcd.c

+22 −9
Original line number Diff line number Diff line
@@ -485,6 +485,26 @@ static struct devfreq_dev_profile ufs_devfreq_profile = { 
	.get_dev_status	= ufshcd_devfreq_get_dev_status,

};



static int ufshcd_devfreq_init(struct ufs_hba *hba)

{

	struct devfreq *devfreq;

	int ret;



	devfreq = devm_devfreq_add_device(hba->dev,

			&ufs_devfreq_profile,

			"simple_ondemand",

			gov_data);

	if (IS_ERR(devfreq)) {

		ret = PTR_ERR(devfreq);

		dev_err(hba->dev, "Unable to register with devfreq %d\n", ret);

		return ret;

	}



	hba->devfreq = devfreq;



	return 0;

}



static inline bool ufshcd_valid_tag(struct ufs_hba *hba, int tag)

{

	return tag >= 0 && tag < hba->nutrs;
@@ -8642,17 +8662,10 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) 
			hba->clk_scaling.saved_pwr_info.is_valid = true;

			hba->clk_scaling.is_scaled_up = true;

			if (!hba->devfreq) {

				hba->devfreq = devm_devfreq_add_device(hba->dev,

							&ufs_devfreq_profile,

							"simple_ondemand",

							gov_data);

				if (IS_ERR(hba->devfreq)) {

					ret = PTR_ERR(hba->devfreq);

					dev_err(hba->dev, "Unable to register with devfreq %d\n",

							ret);

				ret = ufshcd_devfreq_init(hba);

				if (ret)

					goto out;

			}

			}

			hba->clk_scaling.is_allowed = true;

		}