Skip to content

Commit 78317ed

Browse files
rafaeljwrafaeljw
committed
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm into pm-opp
Pull operating performance points (OPP) framework updates for v5.1 from Viresh Kumar: "This pull request contains following changes: - Introduced new OPP helper for power-estimation and used it in several cpufreq drivers (Quentin Perret, Matthias Kaehlcke, Dietmar Eggemann, and Yangtao Li). - OPP Debugfs cleanup (Greg KH). - OPP core cleanup (Viresh Kumar)." * 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm: cpufreq: OMAP: Register an Energy Model cpufreq: imx6q: Register an Energy Model opp: no need to check return value of debugfs_create functions cpufreq: mediatek: Register an Energy Model cpufreq: scmi: Register an Energy Model cpufreq: arm_big_little: Register an Energy Model cpufreq: scpi: Register an Energy Model cpufreq: dt: Register an Energy Model PM / OPP: Introduce a power estimation helper PM / OPP: Remove unused parameter of _generic_set_opp_clk_only()
2 parents d139371 + a9a744d commit 78317ed

File tree

12 files changed

+197
-108
lines changed

12 files changed

+197
-108
lines changed

‎drivers/cpufreq/arm_big_little.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,8 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy)
487487
policy->cpuinfo.transition_latency =
488488
arm_bL_ops->get_transition_latency(cpu_dev);
489489

490+
dev_pm_opp_of_register_em(policy->cpus);
491+
490492
if (is_bL_switching_enabled())
491493
per_cpu(cpu_last_req_freq, policy->cpu) = clk_get_cpu_rate(policy->cpu);
492494

‎drivers/cpufreq/cpufreq-dt.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ static int cpufreq_init(struct cpufreq_policy *policy)
280280
policy->cpuinfo.transition_latency = transition_latency;
281281
policy->dvfs_possible_from_any_cpu = true;
282282

283+
dev_pm_opp_of_register_em(policy->cpus);
284+
283285
return 0;
284286

285287
out_free_cpufreq_table:

‎drivers/cpufreq/imx6q-cpufreq.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ static int imx6q_cpufreq_init(struct cpufreq_policy *policy)
210210
policy->clk = clks[ARM].clk;
211211
ret = cpufreq_generic_init(policy, freq_table, transition_latency);
212212
policy->suspend_freq = max_freq;
213+
dev_pm_opp_of_register_em(policy->cpus);
213214

214215
return ret;
215216
}

‎drivers/cpufreq/mediatek-cpufreq.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,8 @@ static int mtk_cpufreq_init(struct cpufreq_policy *policy)
465465
policy->driver_data = info;
466466
policy->clk = info->cpu_clk;
467467

468+
dev_pm_opp_of_register_em(policy->cpus);
469+
468470
return 0;
469471
}
470472

‎drivers/cpufreq/omap-cpufreq.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ static int omap_cpu_init(struct cpufreq_policy *policy)
133133

134134
/* FIXME: what's the actual transition time? */
135135
result = cpufreq_generic_init(policy, freq_table, 300 * 1000);
136-
if (!result)
136+
if (!result) {
137+
dev_pm_opp_of_register_em(policy->cpus);
137138
return 0;
139+
}
138140

139141
freq_table_free();
140142
fail:

‎drivers/cpufreq/scmi-cpufreq.c

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/cpufreq.h>
1313
#include <linux/cpumask.h>
1414
#include <linux/cpu_cooling.h>
15+
#include <linux/energy_model.h>
1516
#include <linux/export.h>
1617
#include <linux/module.h>
1718
#include <linux/pm_opp.h>
@@ -103,13 +104,42 @@ scmi_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)
103104
return 0;
104105
}
105106

107+
static int __maybe_unused
108+
scmi_get_cpu_power(unsigned long *power, unsigned long *KHz, int cpu)
109+
{
110+
struct device *cpu_dev = get_cpu_device(cpu);
111+
unsigned long Hz;
112+
int ret, domain;
113+
114+
if (!cpu_dev) {
115+
pr_err("failed to get cpu%d device\n", cpu);
116+
return -ENODEV;
117+
}
118+
119+
domain = handle->perf_ops->device_domain_id(cpu_dev);
120+
if (domain < 0)
121+
return domain;
122+
123+
/* Get the power cost of the performance domain. */
124+
Hz = *KHz * 1000;
125+
ret = handle->perf_ops->est_power_get(handle, domain, &Hz, power);
126+
if (ret)
127+
return ret;
128+
129+
/* The EM framework specifies the frequency in KHz. */
130+
*KHz = Hz / 1000;
131+
132+
return 0;
133+
}
134+
106135
static int scmi_cpufreq_init(struct cpufreq_policy *policy)
107136
{
108-
int ret;
137+
int ret, nr_opp;
109138
unsigned int latency;
110139
struct device *cpu_dev;
111140
struct scmi_data *priv;
112141
struct cpufreq_frequency_table *freq_table;
142+
struct em_data_callback em_cb = EM_DATA_CB(scmi_get_cpu_power);
113143

114144
cpu_dev = get_cpu_device(policy->cpu);
115145
if (!cpu_dev) {
@@ -136,8 +166,8 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
136166
return ret;
137167
}
138168

139-
ret = dev_pm_opp_get_opp_count(cpu_dev);
140-
if (ret <= 0) {
169+
nr_opp = dev_pm_opp_get_opp_count(cpu_dev);
170+
if (nr_opp <= 0) {
141171
dev_dbg(cpu_dev, "OPP table is not ready, deferring probe\n");
142172
ret = -EPROBE_DEFER;
143173
goto out_free_opp;
@@ -171,6 +201,9 @@ static int scmi_cpufreq_init(struct cpufreq_policy *policy)
171201
policy->cpuinfo.transition_latency = latency;
172202

173203
policy->fast_switch_possible = true;
204+
205+
em_register_perf_domain(policy->cpus, nr_opp, &em_cb);
206+
174207
return 0;
175208

176209
out_free_priv:

‎drivers/cpufreq/scpi-cpufreq.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ static int scpi_cpufreq_init(struct cpufreq_policy *policy)
170170
policy->cpuinfo.transition_latency = latency;
171171

172172
policy->fast_switch_possible = false;
173+
174+
dev_pm_opp_of_register_em(policy->cpus);
175+
173176
return 0;
174177

175178
out_free_cpufreq_table:

‎drivers/opp/core.c

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,8 @@ static int _set_opp_voltage(struct device *dev, struct regulator *reg,
533533
return ret;
534534
}
535535

536-
static inline int
537-
_generic_set_opp_clk_only(struct device *dev, struct clk *clk,
538-
unsigned long old_freq, unsigned long freq)
536+
static inline int _generic_set_opp_clk_only(struct device *dev, struct clk *clk,
537+
unsigned long freq)
539538
{
540539
int ret;
541540

@@ -572,7 +571,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table,
572571
}
573572

574573
/* Change frequency */
575-
ret = _generic_set_opp_clk_only(dev, opp_table->clk, old_freq, freq);
574+
ret = _generic_set_opp_clk_only(dev, opp_table->clk, freq);
576575
if (ret)
577576
goto restore_voltage;
578577

@@ -586,7 +585,7 @@ static int _generic_set_opp_regulator(const struct opp_table *opp_table,
586585
return 0;
587586

588587
restore_freq:
589-
if (_generic_set_opp_clk_only(dev, opp_table->clk, freq, old_freq))
588+
if (_generic_set_opp_clk_only(dev, opp_table->clk, old_freq))
590589
dev_err(dev, "%s: failed to restore old-freq (%lu Hz)\n",
591590
__func__, old_freq);
592591
restore_voltage:
@@ -759,7 +758,7 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)
759758
opp->supplies);
760759
} else {
761760
/* Only frequency scaling */
762-
ret = _generic_set_opp_clk_only(dev, clk, old_freq, freq);
761+
ret = _generic_set_opp_clk_only(dev, clk, freq);
763762
}
764763

765764
/* Scaling down? Configure required OPPs after frequency */
@@ -793,7 +792,6 @@ static struct opp_device *_add_opp_dev_unlocked(const struct device *dev,
793792
struct opp_table *opp_table)
794793
{
795794
struct opp_device *opp_dev;
796-
int ret;
797795

798796
opp_dev = kzalloc(sizeof(*opp_dev), GFP_KERNEL);
799797
if (!opp_dev)
@@ -805,10 +803,7 @@ static struct opp_device *_add_opp_dev_unlocked(const struct device *dev,
805803
list_add(&opp_dev->node, &opp_table->dev_list);
806804

807805
/* Create debugfs entries for the opp_table */
808-
ret = opp_debug_register(opp_dev, opp_table);
809-
if (ret)
810-
dev_err(dev, "%s: Failed to register opp debugfs (%d)\n",
811-
__func__, ret);
806+
opp_debug_register(opp_dev, opp_table);
812807

813808
return opp_dev;
814809
}
@@ -1229,10 +1224,7 @@ int _opp_add(struct device *dev, struct dev_pm_opp *new_opp,
12291224
new_opp->opp_table = opp_table;
12301225
kref_init(&new_opp->kref);
12311226

1232-
ret = opp_debug_create_one(new_opp, opp_table);
1233-
if (ret)
1234-
dev_err(dev, "%s: Failed to register opp to debugfs (%d)\n",
1235-
__func__, ret);
1227+
opp_debug_create_one(new_opp, opp_table);
12361228

12371229
if (!_opp_supported_by_regulators(new_opp, opp_table)) {
12381230
new_opp->available = false;

‎drivers/opp/debugfs.c

Lines changed: 29 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void opp_debug_remove_one(struct dev_pm_opp *opp)
3535
debugfs_remove_recursive(opp->dentry);
3636
}
3737

38-
static bool opp_debug_create_supplies(struct dev_pm_opp *opp,
38+
static void opp_debug_create_supplies(struct dev_pm_opp *opp,
3939
struct opp_table *opp_table,
4040
struct dentry *pdentry)
4141
{
@@ -50,30 +50,21 @@ static bool opp_debug_create_supplies(struct dev_pm_opp *opp,
5050
/* Create per-opp directory */
5151
d = debugfs_create_dir(name, pdentry);
5252

53-
if (!d)
54-
return false;
53+
debugfs_create_ulong("u_volt_target", S_IRUGO, d,
54+
&opp->supplies[i].u_volt);
5555

56-
if (!debugfs_create_ulong("u_volt_target", S_IRUGO, d,
57-
&opp->supplies[i].u_volt))
58-
return false;
56+
debugfs_create_ulong("u_volt_min", S_IRUGO, d,
57+
&opp->supplies[i].u_volt_min);
5958

60-
if (!debugfs_create_ulong("u_volt_min", S_IRUGO, d,
61-
&opp->supplies[i].u_volt_min))
62-
return false;
59+
debugfs_create_ulong("u_volt_max", S_IRUGO, d,
60+
&opp->supplies[i].u_volt_max);
6361

64-
if (!debugfs_create_ulong("u_volt_max", S_IRUGO, d,
65-
&opp->supplies[i].u_volt_max))
66-
return false;
67-
68-
if (!debugfs_create_ulong("u_amp", S_IRUGO, d,
69-
&opp->supplies[i].u_amp))
70-
return false;
62+
debugfs_create_ulong("u_amp", S_IRUGO, d,
63+
&opp->supplies[i].u_amp);
7164
}
72-
73-
return true;
7465
}
7566

76-
int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
67+
void opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
7768
{
7869
struct dentry *pdentry = opp_table->dentry;
7970
struct dentry *d;
@@ -95,40 +86,23 @@ int opp_debug_create_one(struct dev_pm_opp *opp, struct opp_table *opp_table)
9586

9687
/* Create per-opp directory */
9788
d = debugfs_create_dir(name, pdentry);
98-
if (!d)
99-
return -ENOMEM;
100-
101-
if (!debugfs_create_bool("available", S_IRUGO, d, &opp->available))
102-
return -ENOMEM;
103-
104-
if (!debugfs_create_bool("dynamic", S_IRUGO, d, &opp->dynamic))
105-
return -ENOMEM;
106-
107-
if (!debugfs_create_bool("turbo", S_IRUGO, d, &opp->turbo))
108-
return -ENOMEM;
109-
110-
if (!debugfs_create_bool("suspend", S_IRUGO, d, &opp->suspend))
111-
return -ENOMEM;
112-
113-
if (!debugfs_create_u32("performance_state", S_IRUGO, d, &opp->pstate))
114-
return -ENOMEM;
11589

116-
if (!debugfs_create_ulong("rate_hz", S_IRUGO, d, &opp->rate))
117-
return -ENOMEM;
90+
debugfs_create_bool("available", S_IRUGO, d, &opp->available);
91+
debugfs_create_bool("dynamic", S_IRUGO, d, &opp->dynamic);
92+
debugfs_create_bool("turbo", S_IRUGO, d, &opp->turbo);
93+
debugfs_create_bool("suspend", S_IRUGO, d, &opp->suspend);
94+
debugfs_create_u32("performance_state", S_IRUGO, d, &opp->pstate);
95+
debugfs_create_ulong("rate_hz", S_IRUGO, d, &opp->rate);
96+
debugfs_create_ulong("clock_latency_ns", S_IRUGO, d,
97+
&opp->clock_latency_ns);
11898

119-
if (!opp_debug_create_supplies(opp, opp_table, d))
120-
return -ENOMEM;
121-
122-
if (!debugfs_create_ulong("clock_latency_ns", S_IRUGO, d,
123-
&opp->clock_latency_ns))
124-
return -ENOMEM;
99+
opp_debug_create_supplies(opp, opp_table, d);
125100

126101
opp->dentry = d;
127-
return 0;
128102
}
129103

130-
static int opp_list_debug_create_dir(struct opp_device *opp_dev,
131-
struct opp_table *opp_table)
104+
static void opp_list_debug_create_dir(struct opp_device *opp_dev,
105+
struct opp_table *opp_table)
132106
{
133107
const struct device *dev = opp_dev->dev;
134108
struct dentry *d;
@@ -137,36 +111,21 @@ static int opp_list_debug_create_dir(struct opp_device *opp_dev,
137111

138112
/* Create device specific directory */
139113
d = debugfs_create_dir(opp_table->dentry_name, rootdir);
140-
if (!d) {
141-
dev_err(dev, "%s: Failed to create debugfs dir\n", __func__);
142-
return -ENOMEM;
143-
}
144114

145115
opp_dev->dentry = d;
146116
opp_table->dentry = d;
147-
148-
return 0;
149117
}
150118

151-
static int opp_list_debug_create_link(struct opp_device *opp_dev,
152-
struct opp_table *opp_table)
119+
static void opp_list_debug_create_link(struct opp_device *opp_dev,
120+
struct opp_table *opp_table)
153121
{
154-
const struct device *dev = opp_dev->dev;
155122
char name[NAME_MAX];
156-
struct dentry *d;
157123

158124
opp_set_dev_name(opp_dev->dev, name);
159125

160126
/* Create device specific directory link */
161-
d = debugfs_create_symlink(name, rootdir, opp_table->dentry_name);
162-
if (!d) {
163-
dev_err(dev, "%s: Failed to create link\n", __func__);
164-
return -ENOMEM;
165-
}
166-
167-
opp_dev->dentry = d;
168-
169-
return 0;
127+
opp_dev->dentry = debugfs_create_symlink(name, rootdir,
128+
opp_table->dentry_name);
170129
}
171130

172131
/**
@@ -177,20 +136,13 @@ static int opp_list_debug_create_link(struct opp_device *opp_dev,
177136
* Dynamically adds device specific directory in debugfs 'opp' directory. If the
178137
* device-opp is shared with other devices, then links will be created for all
179138
* devices except the first.
180-
*
181-
* Return: 0 on success, otherwise negative error.
182139
*/
183-
int opp_debug_register(struct opp_device *opp_dev, struct opp_table *opp_table)
140+
void opp_debug_register(struct opp_device *opp_dev, struct opp_table *opp_table)
184141
{
185-
if (!rootdir) {
186-
pr_debug("%s: Uninitialized rootdir\n", __func__);
187-
return -EINVAL;
188-
}
189-
190142
if (opp_table->dentry)
191-
return opp_list_debug_create_link(opp_dev, opp_table);
192-
193-
return opp_list_debug_create_dir(opp_dev, opp_table);
143+
opp_list_debug_create_link(opp_dev, opp_table);
144+
else
145+
opp_list_debug_create_dir(opp_dev, opp_table);
194146
}
195147

196148
static void opp_migrate_dentry(struct opp_device *opp_dev,
@@ -252,10 +204,6 @@ static int __init opp_debug_init(void)
252204
{
253205
/* Create /sys/kernel/debug/opp directory */
254206
rootdir = debugfs_create_dir("opp", NULL);
255-
if (!rootdir) {
256-
pr_err("%s: Failed to create root directory\n", __func__);
257-
return -ENOMEM;
258-
}
259207

260208
return 0;
261209
}

0 commit comments

Comments
 (0)