renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-19 02:54:00 +08:00
Code

PM: EM: Extend em_perf_domain with a flag field

Browse Source 
Merge the current "milliwatts" option into a "flag" field. This intends to
prepare the extension of this structure for inefficient states support in
the Energy Model.

Signed-off-by: Vincent Donnefort <vincent.donnefort@arm.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Vincent Donnefort 2021-09-08 15:05:24 +01:00 committed by Rafael J. Wysocki
parent c8ed99533d
commit 88f7a89560
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/linux/energy_model.h
View File

@ -40,8 +40,7 @@ struct em_perf_state {
* struct em_perf_domain - Performance domain * struct em_perf_domain - Performance domain
* @table: List of performance states, in ascending order * @table: List of performance states, in ascending order
* @nr_perf_states: Number of performance states * @nr_perf_states: Number of performance states
* @milliwatts: Flag indicating the power values are in milli-Watts * @flags: See "em_perf_domain flags"
* or some other scale.
* @cpus: Cpumask covering the CPUs of the domain. It's here * @cpus: Cpumask covering the CPUs of the domain. It's here
* for performance reasons to avoid potential cache * for performance reasons to avoid potential cache
* misses during energy calculations in the scheduler * misses during energy calculations in the scheduler
@ -56,10 +55,18 @@ struct em_perf_state {
struct em_perf_domain { struct em_perf_domain {
struct em_perf_state *table; struct em_perf_state *table;
int nr_perf_states; int nr_perf_states;
int milliwatts; unsigned long flags;
unsigned long cpus[]; unsigned long cpus[];
}; };
/*
* em_perf_domain flags:
*
* EM_PERF_DOMAIN_MILLIWATTS: The power values are in milli-Watts or some
* other scale.
*/
#define EM_PERF_DOMAIN_MILLIWATTS BIT(0)
#define em_span_cpus(em) (to_cpumask((em)->cpus)) #define em_span_cpus(em) (to_cpumask((em)->cpus))
#ifdef CONFIG_ENERGY_MODEL #ifdef CONFIG_ENERGY_MODEL

6
kernel/power/energy_model.c
View File

@ -56,7 +56,8 @@ DEFINE_SHOW_ATTRIBUTE(em_debug_cpus);
static int em_debug_units_show(struct seq_file *s, void *unused) static int em_debug_units_show(struct seq_file *s, void *unused)
{ {
struct em_perf_domain *pd = s->private; struct em_perf_domain *pd = s->private;
char *units = pd->milliwatts ? "milliWatts" : "bogoWatts"; char *units = (pd->flags & EM_PERF_DOMAIN_MILLIWATTS) ?
"milliWatts" : "bogoWatts";
seq_printf(s, "%s\n", units); seq_printf(s, "%s\n", units);
@ -330,7 +331,8 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states,
if (ret) if (ret)
goto unlock; goto unlock;
dev->em_pd->milliwatts = milliwatts; if (milliwatts)
dev->em_pd->flags |= EM_PERF_DOMAIN_MILLIWATTS;
em_debug_create_pd(dev); em_debug_create_pd(dev);
dev_info(dev, "EM: created perf domain\n"); dev_info(dev, "EM: created perf domain\n");