===================================================================
@@ -426,9 +426,11 @@ static int em_create_pd(struct device *d
if (!em_table)
goto free_pd;
- ret = em_create_perf_table(dev, pd, em_table->state, cb, flags);
- if (ret)
- goto free_pd_table;
+ if (cb->active_power) {
+ ret = em_create_perf_table(dev, pd, em_table->state, cb, flags);
+ if (ret)
+ goto free_pd_table;
+ }
ret = em_compute_costs(dev, em_table->state, cb, nr_states, flags);
if (ret)
@@ -561,11 +563,20 @@ int em_dev_register_perf_domain(struct d
{
unsigned long cap, prev_cap = 0;
unsigned long flags = 0;
+ bool stub_pd = false;
int cpu, ret;
if (!dev || !nr_states || !cb)
return -EINVAL;
+ if (!cb->active_power) {
+ if (!cb->get_cost || nr_states > 1 || microwatts)
+ return -EINVAL;
+
+ /* Special case: a stub perf domain. */
+ stub_pd = true;
+ }
+
/*
* Use a mutex to serialize the registration of performance domains and
* let the driver-defined callback functions sleep.
@@ -590,6 +601,15 @@ int em_dev_register_perf_domain(struct d
ret = -EEXIST;
goto unlock;
}
+
+ /*
+ * The capacity need not be the same for all CPUs in a
+ * stub perf domain, so long as the average cost of
+ * running on each of them is approximately the same.
+ */
+ if (stub_pd)
+ continue;
+
/*
* All CPUs of a domain must have the same
* micro-architecture since they all share the same