Linux-ARM-MSM Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements
@ 2020-03-25 18:28 Asutosh Das
  2020-03-25 18:29 ` [PATCH v2 1/3] scsi: ufshcd: Update the set frequency to devfreq Asutosh Das
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Asutosh Das @ 2020-03-25 18:28 UTC (permalink / raw)
  To: Avri.Altman, cang, martin.petersen, linux-scsi; +Cc: Asutosh Das, linux-arm-msm

Enhancements to clock-scaling parameters.
Few bug fixes to clock-scaling.

Changes since v1:
- Addressed comments of v1

Asutosh Das (3):
  scsi: ufshcd: Update the set frequency to devfreq
  scsi: ufshcd: Let vendor override devfreq parameters
  scsi: ufs-qcom: Override devfreq parameters

 drivers/scsi/ufs/ufs-qcom.c | 25 +++++++++++++++++++++++++
 drivers/scsi/ufs/ufshcd.c   | 32 ++++++++++++++++++++++++++++++--
 drivers/scsi/ufs/ufshcd.h   | 12 ++++++++++++
 3 files changed, 67 insertions(+), 2 deletions(-)

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2 1/3] scsi: ufshcd: Update the set frequency to devfreq
  2020-03-25 18:28 [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Asutosh Das
@ 2020-03-25 18:29 ` Asutosh Das
  2020-03-25 18:29 ` [PATCH v2 2/3] scsi: ufshcd: Let vendor override devfreq parameters Asutosh Das
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Asutosh Das @ 2020-03-25 18:29 UTC (permalink / raw)
  To: Avri.Altman, cang, martin.petersen, linux-scsi
  Cc: Asutosh Das, linux-arm-msm, Alim Akhtar, Avri Altman,
	James E.J. Bottomley, Stanley Chu, Bean Huo, Bart Van Assche,
	Venkat Gopalakrishnan, Tomas Winkler, open list

Currently, the frequency that devfreq provides the
driver to set always leads the clocks to be scaled up.
Hence, round the clock-rate to the nearest frequency
before deciding to scale.

Also update the devfreq statistics of current frequency.

Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
---
 drivers/scsi/ufs/ufshcd.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 2a2a63b..7916c8b 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1187,6 +1187,9 @@ static int ufshcd_devfreq_target(struct device *dev,
 	if (!ufshcd_is_clkscaling_supported(hba))
 		return -EINVAL;
 
+	clki = list_first_entry(&hba->clk_list_head, struct ufs_clk_info, list);
+	/* Override with the closest supported frequency */
+	*freq = (unsigned long) clk_round_rate(clki->clk, *freq);
 	spin_lock_irqsave(hba->host->host_lock, irq_flags);
 	if (ufshcd_eh_in_progress(hba)) {
 		spin_unlock_irqrestore(hba->host->host_lock, irq_flags);
@@ -1201,8 +1204,11 @@ static int ufshcd_devfreq_target(struct device *dev,
 		goto out;
 	}
 
-	clki = list_first_entry(&hba->clk_list_head, struct ufs_clk_info, list);
+	/* Decide based on the rounded-off frequency and update */
 	scale_up = (*freq == clki->max_freq) ? true : false;
+	if (!scale_up)
+		*freq = clki->min_freq;
+	/* Update the frequency */
 	if (!ufshcd_is_devfreq_scaling_required(hba, scale_up)) {
 		spin_unlock_irqrestore(hba->host->host_lock, irq_flags);
 		ret = 0;
@@ -1250,6 +1256,8 @@ static int ufshcd_devfreq_get_dev_status(struct device *dev,
 	struct ufs_hba *hba = dev_get_drvdata(dev);
 	struct ufs_clk_scaling *scaling = &hba->clk_scaling;
 	unsigned long flags;
+	struct list_head *clk_list = &hba->clk_list_head;
+	struct ufs_clk_info *clki;
 
 	if (!ufshcd_is_clkscaling_supported(hba))
 		return -EINVAL;
@@ -1260,6 +1268,13 @@ static int ufshcd_devfreq_get_dev_status(struct device *dev,
 	if (!scaling->window_start_t)
 		goto start_window;
 
+	clki = list_first_entry(clk_list, struct ufs_clk_info, list);
+	/*
+	 * If current frequency is 0, then the ondemand governor considers
+	 * there's no initial frequency set. And it always requests to set
+	 * to max. frequency.
+	 */
+	stat->current_frequency = clki->curr_freq;
 	if (scaling->is_busy_started)
 		scaling->tot_busy_t += ktime_to_us(ktime_sub(ktime_get(),
 					scaling->busy_start_t));
-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2 2/3] scsi: ufshcd: Let vendor override devfreq parameters
  2020-03-25 18:28 [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Asutosh Das
  2020-03-25 18:29 ` [PATCH v2 1/3] scsi: ufshcd: Update the set frequency to devfreq Asutosh Das
@ 2020-03-25 18:29 ` Asutosh Das
  2020-03-25 18:29 ` [PATCH v2 3/3] scsi: ufs-qcom: Override " Asutosh Das
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Asutosh Das @ 2020-03-25 18:29 UTC (permalink / raw)
  To: Avri.Altman, cang, martin.petersen, linux-scsi
  Cc: Asutosh Das, linux-arm-msm, Alim Akhtar, Avri Altman,
	James E.J. Bottomley, Stanley Chu, Bean Huo, Bart Van Assche,
	Venkat Gopalakrishnan, Tomas Winkler, Bjorn Andersson, open list

Vendor drivers may have a need to update the polling interval
and thresholds.
Provide a vops for vendor drivers to use.

Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
---
 drivers/scsi/ufs/ufshcd.c | 15 ++++++++++++++-
 drivers/scsi/ufs/ufshcd.h | 12 ++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 7916c8b..61e8974 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1303,6 +1303,17 @@ static struct devfreq_dev_profile ufs_devfreq_profile = {
 	.get_dev_status	= ufshcd_devfreq_get_dev_status,
 };
 
+#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
+static struct devfreq_simple_ondemand_data ufs_ondemand_data = {
+	.upthreshold = 70,
+	.downdifferential = 5,
+};
+
+static void *gov_data = &ufs_ondemand_data;
+#else
+static void *gov_data = NULL;
+#endif
+
 static int ufshcd_devfreq_init(struct ufs_hba *hba)
 {
 	struct list_head *clk_list = &hba->clk_list_head;
@@ -1318,10 +1329,12 @@ static int ufshcd_devfreq_init(struct ufs_hba *hba)
 	dev_pm_opp_add(hba->dev, clki->min_freq, 0);
 	dev_pm_opp_add(hba->dev, clki->max_freq, 0);
 
+	ufshcd_vops_config_scaling_param(hba, &ufs_devfreq_profile,
+					 gov_data);
 	devfreq = devfreq_add_device(hba->dev,
 			&ufs_devfreq_profile,
 			DEVFREQ_GOV_SIMPLE_ONDEMAND,
-			NULL);
+			gov_data);
 	if (IS_ERR(devfreq)) {
 		ret = PTR_ERR(devfreq);
 		dev_err(hba->dev, "Unable to register with devfreq %d\n", ret);
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index d45a044..e8e8ee2 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -56,6 +56,7 @@
 #include <linux/completion.h>
 #include <linux/regulator/consumer.h>
 #include <linux/bitfield.h>
+#include <linux/devfreq.h>
 #include "unipro.h"
 
 #include <asm/irq.h>
@@ -327,6 +328,9 @@ struct ufs_hba_variant_ops {
 	void	(*dbg_register_dump)(struct ufs_hba *hba);
 	int	(*phy_initialization)(struct ufs_hba *);
 	void	(*device_reset)(struct ufs_hba *hba);
+	void	(*config_scaling_param)(struct ufs_hba *hba,
+					struct devfreq_dev_profile *profile,
+					void *data);
 };
 
 /* clock gating state  */
@@ -1083,6 +1087,14 @@ static inline void ufshcd_vops_device_reset(struct ufs_hba *hba)
 	}
 }
 
+static inline void ufshcd_vops_config_scaling_param(struct ufs_hba *hba,
+						    struct devfreq_dev_profile
+						    *profile, void *data)
+{
+	if (hba->vops && hba->vops->config_scaling_param)
+		hba->vops->config_scaling_param(hba, profile, data);
+}
+
 extern struct ufs_pm_lvl_states ufs_pm_lvl_states[];
 
 /*
-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v2 3/3] scsi: ufs-qcom: Override devfreq parameters
  2020-03-25 18:28 [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Asutosh Das
  2020-03-25 18:29 ` [PATCH v2 1/3] scsi: ufshcd: Update the set frequency to devfreq Asutosh Das
  2020-03-25 18:29 ` [PATCH v2 2/3] scsi: ufshcd: Let vendor override devfreq parameters Asutosh Das
@ 2020-03-25 18:29 ` " Asutosh Das
  2020-03-25 23:18 ` [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Avri Altman
  2020-03-27  2:18 ` Martin K. Petersen
  4 siblings, 0 replies; 6+ messages in thread
From: Asutosh Das @ 2020-03-25 18:29 UTC (permalink / raw)
  To: Avri.Altman, cang, martin.petersen, linux-scsi
  Cc: Asutosh Das, linux-arm-msm, Andy Gross, Bjorn Andersson,
	Alim Akhtar, Avri Altman, James E.J. Bottomley, open list

Override devfreq parameters for power-performance
trade-off.

Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
---
 drivers/scsi/ufs/ufs-qcom.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index 6115ac6..19aa5c4 100644
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -10,6 +10,7 @@
 #include <linux/phy/phy.h>
 #include <linux/gpio/consumer.h>
 #include <linux/reset-controller.h>
+#include <linux/devfreq.h>
 
 #include "ufshcd.h"
 #include "ufshcd-pltfrm.h"
@@ -1689,6 +1690,29 @@ static void ufs_qcom_device_reset(struct ufs_hba *hba)
 	usleep_range(10, 15);
 }
 
+#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
+static void ufs_qcom_config_scaling_param(struct ufs_hba *hba,
+					  struct devfreq_dev_profile *p,
+					  void *data)
+{
+	static struct devfreq_simple_ondemand_data *d;
+
+	if (!data)
+		return;
+
+	d = (struct devfreq_simple_ondemand_data *)data;
+	p->polling_ms = 60;
+	d->upthreshold = 70;
+	d->downdifferential = 5;
+}
+#else
+static void ufs_qcom_config_scaling_param(struct ufs_hba *hba,
+					  struct devfreq_dev_profile *p,
+					  void *data)
+{
+}
+#endif
+
 /**
  * struct ufs_hba_qcom_vops - UFS QCOM specific variant operations
  *
@@ -1710,6 +1734,7 @@ static const struct ufs_hba_variant_ops ufs_hba_qcom_vops = {
 	.resume			= ufs_qcom_resume,
 	.dbg_register_dump	= ufs_qcom_dump_dbg_regs,
 	.device_reset		= ufs_qcom_device_reset,
+	.config_scaling_param = ufs_qcom_config_scaling_param,
 };
 
 /**
-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* RE: [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements
  2020-03-25 18:28 [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Asutosh Das
                   ` (2 preceding siblings ...)
  2020-03-25 18:29 ` [PATCH v2 3/3] scsi: ufs-qcom: Override " Asutosh Das
@ 2020-03-25 23:18 ` Avri Altman
  2020-03-27  2:18 ` Martin K. Petersen
  4 siblings, 0 replies; 6+ messages in thread
From: Avri Altman @ 2020-03-25 23:18 UTC (permalink / raw)
  To: Asutosh Das, cang, martin.petersen, linux-scsi; +Cc: linux-arm-msm

Looks good to me.
Thanks,
Avri

> 
> 
> Enhancements to clock-scaling parameters.
> Few bug fixes to clock-scaling.
> 
> Changes since v1:
> - Addressed comments of v1
> 
> Asutosh Das (3):
>   scsi: ufshcd: Update the set frequency to devfreq
>   scsi: ufshcd: Let vendor override devfreq parameters
>   scsi: ufs-qcom: Override devfreq parameters
> 
>  drivers/scsi/ufs/ufs-qcom.c | 25 +++++++++++++++++++++++++
>  drivers/scsi/ufs/ufshcd.c   | 32 ++++++++++++++++++++++++++++++--
>  drivers/scsi/ufs/ufshcd.h   | 12 ++++++++++++
>  3 files changed, 67 insertions(+), 2 deletions(-)
> 
> --
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a
> Linux Foundation Collaborative Project.


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements
  2020-03-25 18:28 [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Asutosh Das
                   ` (3 preceding siblings ...)
  2020-03-25 23:18 ` [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Avri Altman
@ 2020-03-27  2:18 ` Martin K. Petersen
  4 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2020-03-27  2:18 UTC (permalink / raw)
  To: Asutosh Das; +Cc: Avri.Altman, cang, martin.petersen, linux-scsi, linux-arm-msm


Asutosh,

> Enhancements to clock-scaling parameters.  Few bug fixes to
> clock-scaling.

Applied to 5.7/scsi-queue, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, back to index

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 18:28 [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Asutosh Das
2020-03-25 18:29 ` [PATCH v2 1/3] scsi: ufshcd: Update the set frequency to devfreq Asutosh Das
2020-03-25 18:29 ` [PATCH v2 2/3] scsi: ufshcd: Let vendor override devfreq parameters Asutosh Das
2020-03-25 18:29 ` [PATCH v2 3/3] scsi: ufs-qcom: Override " Asutosh Das
2020-03-25 23:18 ` [PATCH v2 0/3] UFS Clock Scaling fixes and enhancements Avri Altman
2020-03-27  2:18 ` Martin K. Petersen

Linux-ARM-MSM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-msm/0 linux-arm-msm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-msm linux-arm-msm/ https://lore.kernel.org/linux-arm-msm \
		linux-arm-msm@vger.kernel.org
	public-inbox-index linux-arm-msm

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-arm-msm


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git