[PATCH 4.4.y-cip 13/23] cpufreq: dt: Reuse dev_pm_opp_get_max_transition_latency()


Chen-Yu Tsai (Moxa) <wens@...>
 

From: Viresh Kumar <viresh.kumar@linaro.org>

commit 755b888ff098c9f762717a9fbda7e05b16619069 upstream.

OPP layer has all the information now to calculate transition latency
(clock_latency + voltage_latency). Lets reuse the OPP layer helper
dev_pm_opp_get_max_transition_latency() instead of open coding the same
in cpufreq-dt driver.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Chen-Yu Tsai (Moxa) <wens@csie.org>
---
drivers/cpufreq/cpufreq-dt.c | 48 +++---------------------------------
1 file changed, 4 insertions(+), 44 deletions(-)

diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
index c3fe89461ff45..6f80ce56b4eca 100644
--- a/drivers/cpufreq/cpufreq-dt.c
+++ b/drivers/cpufreq/cpufreq-dt.c
@@ -222,7 +222,6 @@ static int cpufreq_init(struct cpufreq_policy *policy=
)
struct regulator *cpu_reg;
struct clk *cpu_clk;
struct dev_pm_opp *suspend_opp;
- unsigned long min_uV =3D ~0, max_uV =3D 0;
unsigned int transition_latency;
bool opp_v1 =3D false;
const char *name;
@@ -316,49 +315,6 @@ static int cpufreq_init(struct cpufreq_policy *polic=
y)
priv->reg_name =3D name;
of_property_read_u32(np, "voltage-tolerance", &priv->voltage_tolerance)=
;
=20
- transition_latency =3D dev_pm_opp_get_max_clock_latency(cpu_dev);
- if (!transition_latency)
- transition_latency =3D CPUFREQ_ETERNAL;
-
- if (!IS_ERR(cpu_reg)) {
- unsigned long opp_freq =3D 0;
-
- /*
- * Disable any OPPs where the connected regulator isn't able to
- * provide the specified voltage and record minimum and maximum
- * voltage levels.
- */
- while (1) {
- struct dev_pm_opp *opp;
- unsigned long opp_uV, tol_uV;
-
- rcu_read_lock();
- opp =3D dev_pm_opp_find_freq_ceil(cpu_dev, &opp_freq);
- if (IS_ERR(opp)) {
- rcu_read_unlock();
- break;
- }
- opp_uV =3D dev_pm_opp_get_voltage(opp);
- rcu_read_unlock();
-
- tol_uV =3D opp_uV * priv->voltage_tolerance / 100;
- if (regulator_is_supported_voltage(cpu_reg,
- opp_uV - tol_uV,
- opp_uV + tol_uV)) {
- if (opp_uV < min_uV)
- min_uV =3D opp_uV;
- if (opp_uV > max_uV)
- max_uV =3D opp_uV;
- }
-
- opp_freq++;
- }
-
- ret =3D regulator_set_voltage_time(cpu_reg, min_uV, max_uV);
- if (ret > 0)
- transition_latency +=3D ret * 1000;
- }
-
ret =3D dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table);
if (ret) {
dev_err(cpu_dev, "failed to init cpufreq table: %d\n", ret);
@@ -393,6 +349,10 @@ static int cpufreq_init(struct cpufreq_policy *polic=
y)
cpufreq_dt_attr[1] =3D &cpufreq_freq_attr_scaling_boost_freqs;
}
=20
+ transition_latency =3D dev_pm_opp_get_max_transition_latency(cpu_dev);
+ if (!transition_latency)
+ transition_latency =3D CPUFREQ_ETERNAL;
+
policy->cpuinfo.transition_latency =3D transition_latency;
=20
of_node_put(np);
--=20
2.27.0

Join cip-dev@lists.cip-project.org to automatically receive all group messages.