This allows for another [arch specific] driver to hook into existing powersave bias function of the ondemand governor. i.e. This allows AMD specific powersave bias function (in a separate AMD specific driver) to aid ondemand governor's frequency transition deicisions.
Signed-off-by: Jacob Shin <[email protected]> --- drivers/cpufreq/cpufreq_governor.h | 2 ++ drivers/cpufreq/cpufreq_ondemand.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index c83cabf..d1f7b23 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h @@ -262,4 +262,6 @@ bool need_load_eval(struct cpu_dbs_common_info *cdbs, unsigned int sampling_rate); int cpufreq_governor_dbs(struct cpufreq_policy *policy, struct common_dbs_data *cdata, unsigned int event); +void od_register_ops(struct od_ops *ops); +void od_unregister_ops(struct od_ops *ops); #endif /* _CPUFREQ_GOVERNER_H */ diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 15e80ee..0a101eb 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -40,6 +40,8 @@ static DEFINE_PER_CPU(struct od_cpu_dbs_info_s, od_cpu_dbs_info); +static struct od_ops od_ops; + #ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND static struct cpufreq_governor cpufreq_gov_ondemand; #endif @@ -135,7 +137,7 @@ static void ondemand_powersave_bias_init(void) { int i; for_each_online_cpu(i) { - ondemand_powersave_bias_init_cpu(i); + od_ops.powersave_bias_init_cpu(i); } } @@ -145,7 +147,8 @@ static void dbs_freq_increase(struct cpufreq_policy *p, unsigned int freq) struct od_dbs_tuners *od_tuners = dbs_data->tuners; if (od_tuners->powersave_bias) - freq = powersave_bias_target(p, freq, CPUFREQ_RELATION_H); + freq = od_ops.powersave_bias_target(p, freq, + CPUFREQ_RELATION_H); else if (p->cur == p->max) return; @@ -177,7 +180,7 @@ static void od_check_cpu(int cpu, unsigned int load_freq) if (policy->cur < policy->max) dbs_info->rate_mult = od_tuners->sampling_down_factor; - dbs_freq_increase(policy, policy->max); + od_ops.freq_increase(policy, policy->max); return; } @@ -206,8 +209,8 @@ static void od_check_cpu(int cpu, unsigned int load_freq) __cpufreq_driver_target(policy, freq_next, CPUFREQ_RELATION_L); } else { - int freq = powersave_bias_target(policy, freq_next, - CPUFREQ_RELATION_L); + int freq = od_ops.powersave_bias_target(policy, + freq_next, CPUFREQ_RELATION_L); __cpufreq_driver_target(policy, freq, CPUFREQ_RELATION_L); } @@ -565,6 +568,25 @@ static struct common_dbs_data od_dbs_cdata = { .exit = od_exit, }; +void od_register_ops(struct od_ops *ops) +{ + if (ops->powersave_bias_init_cpu) + od_ops.powersave_bias_init_cpu = ops->powersave_bias_init_cpu; + if (ops->powersave_bias_target) + od_ops.powersave_bias_target = ops->powersave_bias_target; + if (ops->freq_increase) + od_ops.freq_increase = ops->freq_increase; +} +EXPORT_SYMBOL_GPL(od_register_ops); + +void od_unregister_ops(struct od_ops *ops) +{ + od_ops.powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu; + od_ops.powersave_bias_target = powersave_bias_target; + od_ops.freq_increase = dbs_freq_increase; +} +EXPORT_SYMBOL_GPL(od_unregister_ops); + static int od_cpufreq_governor_dbs(struct cpufreq_policy *policy, unsigned int event) { -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
