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

Commit b334456e authored by Subhash Jadavani's avatar Subhash Jadavani Committed by Martin K. Petersen
Browse files

scsi: ufs: ufshcd: fix possible unclocked register access 



Vendor specific setup_clocks ops may depend on clocks managed by ufshcd
driver so if the vendor specific setup_clocks callback is called when
the required clocks are turned off, it results into unclocked register
access.

This change make sure that required clocks are enabled before vendor
specific setup_clocks callback is called.

Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarVenkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2e3611e9

drivers/scsi/ufs/ufshcd.c

+20 −6
Original line number Diff line number Diff line
@@ -6912,9 +6912,16 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, 
	if (list_empty(head))

		goto out;



	/*

	 * vendor specific setup_clocks ops may depend on clocks managed by

	 * this standard driver hence call the vendor specific setup_clocks

	 * before disabling the clocks managed here.

	 */

	if (!on) {

		ret = ufshcd_vops_setup_clocks(hba, on, PRE_CHANGE);

		if (ret)

			return ret;

	}



	list_for_each_entry(clki, head, list) {

		if (!IS_ERR_OR_NULL(clki->clk)) {
@@ -6938,9 +6945,16 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on, 
		}

	}



	/*

	 * vendor specific setup_clocks ops may depend on clocks managed by

	 * this standard driver hence call the vendor specific setup_clocks

	 * after enabling the clocks managed here.

	 */

	if (on) {

		ret = ufshcd_vops_setup_clocks(hba, on, POST_CHANGE);

		if (ret)

			return ret;

	}



out:

	if (ret) {