[2/3] PM / Domains: Add support for 'assigned-performance-states'
diff mbox series

Message ID 1596541616-27688-3-git-send-email-rnayak@codeaurora.org
State Changes Requested, archived
Headers show
Series
  • Add support for assigned-performance-states
Related show

Commit Message

Rajendra Nayak Aug. 4, 2020, 11:46 a.m. UTC
For devices which have 'assigned-performance-states' specified in DT,
set the specified performance state during attach and drop it on detach.
Also drop/set as part of runtime suspend/resume callbacks.

Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
 drivers/base/power/domain.c | 27 +++++++++++++++++++++++++++
 include/linux/pm_domain.h   |  1 +
 2 files changed, 28 insertions(+)

Comments

Ulf Hansson Aug. 12, 2020, 9:37 a.m. UTC | #1
On Tue, 4 Aug 2020 at 13:47, Rajendra Nayak <rnayak@codeaurora.org> wrote:
>
> For devices which have 'assigned-performance-states' specified in DT,
> set the specified performance state during attach and drop it on detach.
> Also drop/set as part of runtime suspend/resume callbacks.

To allow flexibility, I would prefer to keep the performance state
being orthogonal to the power on/off state for a genpd.

Therefore, I am wondering if this is better handled by the consumer
driver instead?

Kind regards
Uffe

>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
> ---
>  drivers/base/power/domain.c | 27 +++++++++++++++++++++++++++
>  include/linux/pm_domain.h   |  1 +
>  2 files changed, 28 insertions(+)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index 0a01df60..8704823 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -810,6 +810,10 @@ static int genpd_runtime_suspend(struct device *dev)
>         if (irq_safe_dev_in_no_sleep_domain(dev, genpd))
>                 return 0;
>
> +       /* Drop the assigned performance state */
> +       if (dev_gpd_data(dev)->assigned_pstate)
> +               dev_pm_genpd_set_performance_state(dev, 0);
> +
>         genpd_lock(genpd);
>         genpd_power_off(genpd, true, 0);
>         genpd_unlock(genpd);
> @@ -829,6 +833,7 @@ static int genpd_runtime_resume(struct device *dev)
>  {
>         struct generic_pm_domain *genpd;
>         struct gpd_timing_data *td = &dev_gpd_data(dev)->td;
> +       unsigned int assigned_pstate = dev_gpd_data(dev)->assigned_pstate;
>         bool runtime_pm = pm_runtime_enabled(dev);
>         ktime_t time_start;
>         s64 elapsed_ns;
> @@ -857,6 +862,9 @@ static int genpd_runtime_resume(struct device *dev)
>         if (ret)
>                 return ret;
>
> +       /* Set the assigned performance state */
> +       if (assigned_pstate)
> +               dev_pm_genpd_set_performance_state(dev, assigned_pstate);
>   out:
>         /* Measure resume latency. */
>         time_start = 0;
> @@ -890,6 +898,8 @@ static int genpd_runtime_resume(struct device *dev)
>  err_poweroff:
>         if (!pm_runtime_is_irq_safe(dev) ||
>                 (pm_runtime_is_irq_safe(dev) && genpd_is_irq_safe(genpd))) {
> +               if (assigned_pstate)
> +                       dev_pm_genpd_set_performance_state(dev, 0);
>                 genpd_lock(genpd);
>                 genpd_power_off(genpd, true, 0);
>                 genpd_unlock(genpd);
> @@ -2405,6 +2415,12 @@ static void genpd_dev_pm_detach(struct device *dev, bool power_off)
>
>         dev_dbg(dev, "removing from PM domain %s\n", pd->name);
>
> +       /* Drop the assigned performance state */
> +       if (dev_gpd_data(dev)->assigned_pstate) {
> +               dev_pm_genpd_set_performance_state(dev, 0);
> +               dev_gpd_data(dev)->assigned_pstate = 0;
> +       }
> +
>         for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) {
>                 ret = genpd_remove_device(pd, dev);
>                 if (ret != -EAGAIN)
> @@ -2442,6 +2458,7 @@ static void genpd_dev_pm_sync(struct device *dev)
>  static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,
>                                  unsigned int index, bool power_on)
>  {
> +       unsigned int assigned_pstate;
>         struct of_phandle_args pd_args;
>         struct generic_pm_domain *pd;
>         int ret;
> @@ -2485,6 +2502,16 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,
>         if (ret)
>                 genpd_remove_device(pd, dev);
>
> +       /* Set the assigned performance state */
> +       if (!of_property_read_u32_index(base_dev->of_node,
> +                                       "assigned-performance-states",
> +                                       index, &assigned_pstate)) {
> +               if (assigned_pstate) {
> +                       dev_pm_genpd_set_performance_state(dev, assigned_pstate);
> +                       dev_gpd_data(dev)->assigned_pstate = assigned_pstate;
> +               }
> +       }
> +
>         return ret ? -EPROBE_DEFER : 1;
>  }
>
> diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
> index 9ec78ee..4a415ee 100644
> --- a/include/linux/pm_domain.h
> +++ b/include/linux/pm_domain.h
> @@ -180,6 +180,7 @@ struct generic_pm_domain_data {
>         struct notifier_block nb;
>         int cpu;
>         unsigned int performance_state;
> +       unsigned int assigned_pstate;
>         void *data;
>  };
>
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>

Patch
diff mbox series

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 0a01df60..8704823 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -810,6 +810,10 @@  static int genpd_runtime_suspend(struct device *dev)
 	if (irq_safe_dev_in_no_sleep_domain(dev, genpd))
 		return 0;
 
+	/* Drop the assigned performance state */
+	if (dev_gpd_data(dev)->assigned_pstate)
+		dev_pm_genpd_set_performance_state(dev, 0);
+
 	genpd_lock(genpd);
 	genpd_power_off(genpd, true, 0);
 	genpd_unlock(genpd);
@@ -829,6 +833,7 @@  static int genpd_runtime_resume(struct device *dev)
 {
 	struct generic_pm_domain *genpd;
 	struct gpd_timing_data *td = &dev_gpd_data(dev)->td;
+	unsigned int assigned_pstate = dev_gpd_data(dev)->assigned_pstate;
 	bool runtime_pm = pm_runtime_enabled(dev);
 	ktime_t time_start;
 	s64 elapsed_ns;
@@ -857,6 +862,9 @@  static int genpd_runtime_resume(struct device *dev)
 	if (ret)
 		return ret;
 
+	/* Set the assigned performance state */
+	if (assigned_pstate)
+		dev_pm_genpd_set_performance_state(dev, assigned_pstate);
  out:
 	/* Measure resume latency. */
 	time_start = 0;
@@ -890,6 +898,8 @@  static int genpd_runtime_resume(struct device *dev)
 err_poweroff:
 	if (!pm_runtime_is_irq_safe(dev) ||
 		(pm_runtime_is_irq_safe(dev) && genpd_is_irq_safe(genpd))) {
+		if (assigned_pstate)
+			dev_pm_genpd_set_performance_state(dev, 0);
 		genpd_lock(genpd);
 		genpd_power_off(genpd, true, 0);
 		genpd_unlock(genpd);
@@ -2405,6 +2415,12 @@  static void genpd_dev_pm_detach(struct device *dev, bool power_off)
 
 	dev_dbg(dev, "removing from PM domain %s\n", pd->name);
 
+	/* Drop the assigned performance state */
+	if (dev_gpd_data(dev)->assigned_pstate) {
+		dev_pm_genpd_set_performance_state(dev, 0);
+		dev_gpd_data(dev)->assigned_pstate = 0;
+	}
+
 	for (i = 1; i < GENPD_RETRY_MAX_MS; i <<= 1) {
 		ret = genpd_remove_device(pd, dev);
 		if (ret != -EAGAIN)
@@ -2442,6 +2458,7 @@  static void genpd_dev_pm_sync(struct device *dev)
 static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,
 				 unsigned int index, bool power_on)
 {
+	unsigned int assigned_pstate;
 	struct of_phandle_args pd_args;
 	struct generic_pm_domain *pd;
 	int ret;
@@ -2485,6 +2502,16 @@  static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,
 	if (ret)
 		genpd_remove_device(pd, dev);
 
+	/* Set the assigned performance state */
+	if (!of_property_read_u32_index(base_dev->of_node,
+					"assigned-performance-states",
+					index, &assigned_pstate)) {
+		if (assigned_pstate) {
+			dev_pm_genpd_set_performance_state(dev, assigned_pstate);
+			dev_gpd_data(dev)->assigned_pstate = assigned_pstate;
+		}
+	}
+
 	return ret ? -EPROBE_DEFER : 1;
 }
 
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index 9ec78ee..4a415ee 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -180,6 +180,7 @@  struct generic_pm_domain_data {
 	struct notifier_block nb;
 	int cpu;
 	unsigned int performance_state;
+	unsigned int assigned_pstate;
 	void *data;
 };