Commit 5e011fcc authored by Can Guo's avatar Can Guo Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Pass target_freq to clk_scale_notify() vop 



Instead of only two frequencies, if OPP V2 is used, the UFS devfreq clock
scaling may scale the clock among multiple frequencies, so just passing
up/down to vop clk_scale_notify() is not enough to cover the intermediate
clock freqs between the min and max freqs. Hence pass the target_freq,
which will be used in successive commits, to clk_scale_notify() to allow
the vop to perform corresponding configurations with regard to the clock
freqs.

Signed-off-by: default avatarCan Guo <quic_cang@quicinc.com>
Co-developed-by: default avatarZiqi Chen <quic_ziqichen@quicinc.com>
Signed-off-by: default avatarZiqi Chen <quic_ziqichen@quicinc.com>
Link: https://lore.kernel.org/r/20250213080008.2984807-2-quic_ziqichen@quicinc.com


Reviewed-by: default avatarBean Huo <beanhuo@micron.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Reviewed-by: default avatarPeter Wang <peter.wang@mediatek.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2014c95a

drivers/ufs/core/ufshcd-priv.h

+4 −3
Original line number Diff line number Diff line
@@ -117,11 +117,12 @@ static inline u32 ufshcd_vops_get_ufs_hci_version(struct ufs_hba *hba) 
	return ufshcd_readl(hba, REG_UFS_VERSION);

}



static inline int ufshcd_vops_clk_scale_notify(struct ufs_hba *hba,

			bool up, enum ufs_notify_change_status status)

static inline int ufshcd_vops_clk_scale_notify(struct ufs_hba *hba, bool up,

					       unsigned long target_freq,

					       enum ufs_notify_change_status status)

{

	if (hba->vops && hba->vops->clk_scale_notify)

		return hba->vops->clk_scale_notify(hba, up, status);

		return hba->vops->clk_scale_notify(hba, up, target_freq, status);

	return 0;

}

drivers/ufs/core/ufshcd.c

+2 −2
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, unsigned long freq, 
	int ret = 0;

	ktime_t start = ktime_get();



	ret = ufshcd_vops_clk_scale_notify(hba, scale_up, PRE_CHANGE);

	ret = ufshcd_vops_clk_scale_notify(hba, scale_up, freq, PRE_CHANGE);

	if (ret)

		goto out;
@@ -1173,7 +1173,7 @@ static int ufshcd_scale_clks(struct ufs_hba *hba, unsigned long freq, 
	if (ret)

		goto out;



	ret = ufshcd_vops_clk_scale_notify(hba, scale_up, POST_CHANGE);

	ret = ufshcd_vops_clk_scale_notify(hba, scale_up, freq, POST_CHANGE);

	if (ret) {

		if (hba->use_pm_opp)

			ufshcd_opp_set_rate(hba,

drivers/ufs/host/ufs-mediatek.c

+1 −0
Original line number Diff line number Diff line
@@ -1643,6 +1643,7 @@ static void ufs_mtk_clk_scale(struct ufs_hba *hba, bool scale_up) 
}



static int ufs_mtk_clk_scale_notify(struct ufs_hba *hba, bool scale_up,

				    unsigned long target_freq,

				    enum ufs_notify_change_status status)

{

	if (!ufshcd_is_clkscaling_supported(hba))

drivers/ufs/host/ufs-qcom.c

+3 −2
Original line number Diff line number Diff line
@@ -1394,8 +1394,9 @@ static int ufs_qcom_clk_scale_down_post_change(struct ufs_hba *hba) 
	return ufs_qcom_set_core_clk_ctrl(hba, false);

}



static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba,

		bool scale_up, enum ufs_notify_change_status status)

static int ufs_qcom_clk_scale_notify(struct ufs_hba *hba, bool scale_up,

				     unsigned long target_freq,

				     enum ufs_notify_change_status status)

{

	struct ufs_qcom_host *host = ufshcd_get_variant(hba);

	int err;

include/ufs/ufshcd.h

+2 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ struct ufs_hba_variant_ops { 
	void    (*exit)(struct ufs_hba *);

	u32	(*get_ufs_hci_version)(struct ufs_hba *);

	int	(*set_dma_mask)(struct ufs_hba *);

	int	(*clk_scale_notify)(struct ufs_hba *, bool,

	int	(*clk_scale_notify)(struct ufs_hba *, bool, unsigned long,

				enum ufs_notify_change_status);

	int	(*setup_clocks)(struct ufs_hba *, bool,

				enum ufs_notify_change_status);