On Monday, July 27, 2015 05:58:07 PM Viresh Kumar wrote: > Conservative governor has its own 'enable' field to check if > conservative governor is used for a CPU or not > > This can be checked by policy->governor with 'cpufreq_gov_conservative' > and so this field can be dropped. > > Because its not guaranteed that dbs_info->cdbs.shared will a valid > pointer for all CPUs (will be NULL for CPUs that don't use > ondemand/conservative governors), we can't use it anymore. Lets get > policy with cpufreq_cpu_get() instead.
But previously, if the enable bit was set, we actually new that the pointer was valid, right? > Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org> > --- > drivers/cpufreq/cpufreq_conservative.c | 34 > +++++++++++++++++++++------------- > drivers/cpufreq/cpufreq_governor.c | 12 +----------- > drivers/cpufreq/cpufreq_governor.h | 1 - > 3 files changed, 22 insertions(+), 25 deletions(-) > > diff --git a/drivers/cpufreq/cpufreq_conservative.c > b/drivers/cpufreq/cpufreq_conservative.c > index 84a1506950a7..18bfbc313e48 100644 > --- a/drivers/cpufreq/cpufreq_conservative.c > +++ b/drivers/cpufreq/cpufreq_conservative.c > @@ -23,6 +23,19 @@ > > static DEFINE_PER_CPU(struct cs_cpu_dbs_info_s, cs_cpu_dbs_info); > > +static int cs_cpufreq_governor_dbs(struct cpufreq_policy *policy, > + unsigned int event); > + > +#ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE > +static > +#endif > +struct cpufreq_governor cpufreq_gov_conservative = { > + .name = "conservative", > + .governor = cs_cpufreq_governor_dbs, > + .max_transition_latency = TRANSITION_LATENCY_LIMIT, > + .owner = THIS_MODULE, > +}; > + > static inline unsigned int get_freq_target(struct cs_dbs_tuners *cs_tuners, > struct cpufreq_policy *policy) > { > @@ -119,12 +132,14 @@ static int dbs_cpufreq_notifier(struct notifier_block > *nb, unsigned long val, > struct cpufreq_freqs *freq = data; > struct cs_cpu_dbs_info_s *dbs_info = > &per_cpu(cs_cpu_dbs_info, freq->cpu); > - struct cpufreq_policy *policy; > + struct cpufreq_policy *policy = cpufreq_cpu_get(freq->cpu); > > - if (!dbs_info->enable) > + if (!policy) > return 0; > > - policy = dbs_info->cdbs.shared->policy; So here we could get to the policy directly. After the change we have to: - acquire cpufreq_rwsem - acquire cpufreq_driver_lock - go the kobject_get on policy->kobj and then finally drop the reference to the kobject when we're done. So may I ask where exactly is the improvement? > + /* policy isn't governed by conservative governor */ > + if (policy->governor != &cpufreq_gov_conservative) > + goto policy_put; > > /* > * we only care if our internally tracked freq moves outside the 'valid' Thanks, Rafael -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/