OPP: refactor dev_pm_opp_of_register_em() and update related drivers

The Energy Model framework supports not only CPU devices. Drop the CPU specific interface with cpumask and add struct device. Add also a return value, user might use it. This new interface provides easy way to create a simple Energy Model, which then might be used by e.g. thermal subsystem.

Lukasz Luba committed 6 years ago

Commit 0e0ffa81 parent 7b7570a9 files · +65 −35Browse files

Unified · Split

9 files

drivers/cpufreq/cpufreq-dt.c +1 −1
drivers/cpufreq/imx6q-cpufreq.c +1 −1
drivers/cpufreq/mediatek-cpufreq.c +1 −1
drivers/cpufreq/omap-cpufreq.c +1 −1
drivers/cpufreq/qcom-cpufreq-hw.c +1 −1
drivers/cpufreq/scpi-cpufreq.c +1 −1
drivers/cpufreq/vexpress-spc-cpufreq.c +1 −1
drivers/opp/of.c +45 −26
include/linux/pm_opp.h +13 −2

drivers/cpufreq/cpufreq-dt.c+1−1

@@ -279,7 +279,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) · 278 unmodified lines
279	policy->cpuinfo.transition_latency = transition_latency;	279	policy->cpuinfo.transition_latency = transition_latency;
280	policy->dvfs_possible_from_any_cpu = true;	280	policy->dvfs_possible_from_any_cpu = true;
281		281
282	dev_pm_opp_of_register_em(policy->cpus);	282	dev_pm_opp_of_register_em(cpu_dev, policy->cpus);
283		283
284	return 0;	284	return 0;
285		285

drivers/cpufreq/imx6q-cpufreq.c+1−1

@@ -193,7 +193,7 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy) · 192 unmodified lines
193	policy->clk = clks[ARM].clk;	193	policy->clk = clks[ARM].clk;
194	cpufreq_generic_init(policy, freq_table, transition_latency);	194	cpufreq_generic_init(policy, freq_table, transition_latency);
195	policy->suspend_freq = max_freq;	195	policy->suspend_freq = max_freq;
196	dev_pm_opp_of_register_em(policy->cpus);	196	dev_pm_opp_of_register_em(cpu_dev, policy->cpus);
197		197
198	return 0;	198	return 0;
199	}	199	}

drivers/cpufreq/mediatek-cpufreq.c+1−1

@@ -448,7 +448,7 @@ static int mtk_cpufreq_init(struct cpufreq_policy *policy) · 447 unmodified lines
448	policy->driver_data = info;	448	policy->driver_data = info;
449	policy->clk = info->cpu_clk;	449	policy->clk = info->cpu_clk;
450		450
451	dev_pm_opp_of_register_em(policy->cpus);	451	dev_pm_opp_of_register_em(info->cpu_dev, policy->cpus);
452		452
453	return 0;	453	return 0;
454	}	454	}

drivers/cpufreq/omap-cpufreq.c+1−1

@@ -131,7 +131,7 @@ static int omap_cpu_init(struct cpufreq_policy *policy) · 130 unmodified lines
131		131
132	/* FIXME: what's the actual transition time? */	132	/* FIXME: what's the actual transition time? */
133	cpufreq_generic_init(policy, freq_table, 300 * 1000);	133	cpufreq_generic_init(policy, freq_table, 300 * 1000);
134	dev_pm_opp_of_register_em(policy->cpus);	134	dev_pm_opp_of_register_em(mpu_dev, policy->cpus);
135		135
136	return 0;	136	return 0;
137	}	137	}

drivers/cpufreq/qcom-cpufreq-hw.c+1−1

@@ -238,7 +238,7 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_policy *policy) · 237 unmodified lines
238	goto error;	238	goto error;
239	}	239	}
240		240
241	dev_pm_opp_of_register_em(policy->cpus);	241	dev_pm_opp_of_register_em(cpu_dev, policy->cpus);
242		242
243	policy->fast_switch_possible = true;	243	policy->fast_switch_possible = true;
244		244

drivers/cpufreq/scpi-cpufreq.c+1−1

@@ -167,7 +167,7 @@ static int scpi_cpufreq_init(struct cpufreq_policy *policy) · 166 unmodified lines
167		167
168	policy->fast_switch_possible = false;	168	policy->fast_switch_possible = false;
169		169
170	dev_pm_opp_of_register_em(policy->cpus);	170	dev_pm_opp_of_register_em(cpu_dev, policy->cpus);
171		171
172	return 0;	172	return 0;
173		173

drivers/cpufreq/vexpress-spc-cpufreq.c+1−1

@@ -450,7 +450,7 @@ static int ve_spc_cpufreq_init(struct cpufreq_policy *policy) · 449 unmodified lines
450	policy->freq_table = freq_table[cur_cluster];	450	policy->freq_table = freq_table[cur_cluster];
451	policy->cpuinfo.transition_latency = 1000000; /* 1 ms */	451	policy->cpuinfo.transition_latency = 1000000; /* 1 ms */
452		452
453	dev_pm_opp_of_register_em(policy->cpus);	453	dev_pm_opp_of_register_em(cpu_dev, policy->cpus);
454		454
455	if (is_bL_switching_enabled())	455	if (is_bL_switching_enabled())
456	per_cpu(cpu_last_req_freq, policy->cpu) =	456	per_cpu(cpu_last_req_freq, policy->cpu) =

drivers/opp/of.c+45−26

 /*
  * Callback function provided to the Energy Model framework upon registration.
- * This computes the power estimated by @CPU at @kHz if it is the frequency
+ * This computes the power estimated by @dev at @kHz if it is the frequency
  * of an existing OPP, or at the frequency of the first OPP above @kHz otherwise
  * (see dev_pm_opp_find_freq_ceil()). This function updates @kHz to the ceiled
  * frequency and @mW to the associated power. The power is estimated as
- * P = C * V^2 * f with C being the CPU's capacitance and V and f respectively
+ * P = C * V^2 * f with C being the device's capacitance and V and f
- * the voltage and frequency of the OPP.
+ * respectively the voltage and frequency of the OPP.
  *
- * Returns -ENODEV if the CPU device cannot be found, -EINVAL if the power
+ * Returns -EINVAL if the power calculation failed because of missing
- * calculation failed because of missing parameters, 0 otherwise.
+ * parameters, 0 otherwise.
  */
-static int __maybe_unused _get_cpu_power(unsigned long *mW, unsigned long *kHz,
+static int __maybe_unused _get_power(unsigned long *mW, unsigned long *kHz,
-					 struct device *cpu_dev)
+				     struct device *dev)
 {
 	struct dev_pm_opp *opp;
 	struct device_node *np;
 	u64 tmp;
 	int ret;
-	np = of_node_get(cpu_dev->of_node);
+	np = of_node_get(dev->of_node);
 	if (!np)
 		return -EINVAL;
 		return -EINVAL;
 	Hz = *kHz * 1000;
-	opp = dev_pm_opp_find_freq_ceil(cpu_dev, &Hz);
+	opp = dev_pm_opp_find_freq_ceil(dev, &Hz);
 	if (IS_ERR(opp))
 		return -EINVAL;
 /**
  * dev_pm_opp_of_register_em() - Attempt to register an Energy Model
- * @cpus	: CPUs for which an Energy Model has to be registered
+ * @dev		: Device for which an Energy Model has to be registered
+ * @cpus	: CPUs for which an Energy Model has to be registered. For
+ *		other type of devices it should be set to NULL.
  *
  * This checks whether the "dynamic-power-coefficient" devicetree property has
  * been specified, and tries to register an Energy Model with it if it has.
+ * Having this property means the voltages are known for OPPs and the EM
+ * might be calculated.
  */
-void dev_pm_opp_of_register_em(struct cpumask *cpus)
+int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus)
 {
-	struct em_data_callback em_cb = EM_DATA_CB(_get_cpu_power);
+	struct em_data_callback em_cb = EM_DATA_CB(_get_power);
-	int ret, nr_opp, cpu = cpumask_first(cpus);
-	struct device *cpu_dev;
 	struct device_node *np;
+	int ret, nr_opp;
 	u32 cap;
-	cpu_dev = get_cpu_device(cpu);
+	if (IS_ERR_OR_NULL(dev)) {
-	if (!cpu_dev)
+		ret = -EINVAL;
-		return;
+		goto failed;
+	}
-	nr_opp = dev_pm_opp_get_opp_count(cpu_dev);
+	nr_opp = dev_pm_opp_get_opp_count(dev);
-	if (nr_opp <= 0)
+	if (nr_opp <= 0) {
-		return;
+		ret = -EINVAL;
+		goto failed;
+	}
-	np = of_node_get(cpu_dev->of_node);
+	np = of_node_get(dev->of_node);
-	if (!np)
+	if (!np) {
-		return;
+		ret = -EINVAL;
+		goto failed;
+	}
 	/*
 	 * Register an EM only if the 'dynamic-power-coefficient' property is
 	 */
 	ret = of_property_read_u32(np, "dynamic-power-coefficient", &cap);
 	of_node_put(np);
-	if (ret || !cap)
+	if (ret || !cap) {
-		return;
+		dev_dbg(dev, "Couldn't find proper 'dynamic-power-coefficient' in DT\n");
+		ret = -EINVAL;
+		goto failed;
+	}
-	em_dev_register_perf_domain(cpu_dev, nr_opp, &em_cb, cpus);
+	ret = em_dev_register_perf_domain(dev, nr_opp, &em_cb, cpus);
+	if (ret)
+		goto failed;
+	return 0;
+failed:
+	dev_dbg(dev, "Couldn't register Energy Model %d\n", ret);
+	return ret;
 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_of_register_em);

include/linux/pm_opp.h+13−2

 #ifndef __LINUX_OPP_H__
 #define __LINUX_OPP_H__
+#include <linux/energy_model.h>
 #include <linux/err.h>
 #include <linux/notifier.h>
 struct device_node *dev_pm_opp_get_of_node(struct dev_pm_opp *opp);
 int of_get_required_opp_performance_state(struct device_node *np, int index);
 int dev_pm_opp_of_find_icc_paths(struct device *dev, struct opp_table *opp_table);
-void dev_pm_opp_of_register_em(struct cpumask *cpus);
+int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus);
+static inline void dev_pm_opp_of_unregister_em(struct device *dev)
+{
+	em_dev_unregister_perf_domain(dev);
+}
 #else
 static inline int dev_pm_opp_of_add_table(struct device *dev)
 {
 	return NULL;
 }
-static inline void dev_pm_opp_of_register_em(struct cpumask *cpus)
+static inline int dev_pm_opp_of_register_em(struct device *dev,
+					    struct cpumask *cpus)
+{
+	return -ENOTSUPP;
+}
+static inline void dev_pm_opp_of_unregister_em(struct device *dev)
 {
 }