On Wednesday, March 20, 2013 10:59:13 AM Viresh Kumar wrote: > On 4 March 2013 13:07, Viresh Kumar <viresh.kumar@xxxxxxxxxx> wrote: > > Currently, there can't be multiple instances of single governor_type. If we have > > a multi-package system, where we have multiple instances of struct policy (per > > package), we can't have multiple instances of same governor. i.e. We can't have > > multiple instances of ondemand governor for multiple packages. > > > > Governors directory in sysfs is created at /sys/devices/system/cpu/cpufreq/ > > governor-name/. Which again reflects that there can be only one instance of a > > governor_type in the system. > > > > This is a bottleneck for multicluster system, where we want different packages > > to use same governor type, but with different tunables. > > > > This patch uses the infrastructure provided by earlier patch and implements > > init/exit routines for ondemand and conservative governors. > > > > Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx> > > As discussed in other patch thread, i dropped "cpufreq: Add Kconfig option > to enable/disable have_multiple_policies" patch and following is the fixup > to this patch: > > I have queued all patches i had for 3.10 here: > > http://git.linaro.org/gitweb?p=people/vireshk/linux.git;a=shortlog;h=refs/heads/for-3.10 OK, applied these to linux-pm.git/bleeding-edge. At the moment bleeding-edge and linux-next diverged slightly on cpufreq, but I hope the bleeding-edge material won't cause build problems to occur, so I'll be able to move it to linux-next shortly. > commit f02fca9a2478088c4f7dadf82d998ae007a56285 > Author: Viresh Kumar <viresh.kumar@xxxxxxxxxx> > Date: Wed Mar 20 10:50:33 2013 +0530 > > fixup! cpufreq: governor: Implement per policy instances of governors I'd actually prefer you to post complete updated patches instead of these fixups. They are real PITA for me and probably for everybody else trying to follow the cpufreq development recently. Thanks, Rafael > --- > drivers/cpufreq/cpufreq.c | 8 ++++++++ > include/linux/cpufreq.h | 22 ++++++++-------------- > 2 files changed, 16 insertions(+), 14 deletions(-) > > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c > index a843855..3d83b02 100644 > --- a/drivers/cpufreq/cpufreq.c > +++ b/drivers/cpufreq/cpufreq.c > @@ -128,6 +128,14 @@ void disable_cpufreq(void) > static LIST_HEAD(cpufreq_governor_list); > static DEFINE_MUTEX(cpufreq_governor_mutex); > > +struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy) > +{ > + if (cpufreq_driver->have_multiple_policies) > + return &policy->kobj; > + else > + return cpufreq_global_kobject; > +} > + > static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs) > { > struct cpufreq_policy *data; > diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h > index 6e1abd2..805c4d3 100644 > --- a/include/linux/cpufreq.h > +++ b/include/linux/cpufreq.h > @@ -107,11 +107,6 @@ struct cpufreq_policy { > unsigned int policy; /* see above */ > struct cpufreq_governor *governor; /* see below */ > void *governor_data; > - /* This should be set by init() of platforms having multiple > - * clock-domains, i.e. supporting multiple policies. With this sysfs > - * directories of governor would be created in cpu/cpu<num>/cpufreq/ > - * directory */ > - bool have_multiple_policies; > > struct work_struct update; /* if update_policy() needs to be > * called, but you're in IRQ context */ > @@ -139,15 +134,6 @@ static inline bool policy_is_shared(struct > cpufreq_policy *policy) > return cpumask_weight(policy->cpus) > 1; > } > > -static inline struct kobject * > -get_governor_parent_kobj(struct cpufreq_policy *policy) > -{ > - if (policy->have_multiple_policies) > - return &policy->kobj; > - else > - return cpufreq_global_kobject; > -} > - > /******************** cpufreq transition notifiers *******************/ > > #define CPUFREQ_PRECHANGE (0) > @@ -245,6 +231,13 @@ struct cpufreq_driver { > struct module *owner; > char name[CPUFREQ_NAME_LEN]; > u8 flags; > + /* > + * This should be set by init() of platforms having multiple > + * clock-domains, i.e. supporting multiple policies. With this sysfs > + * directories of governor would be created in cpu/cpu<num>/cpufreq/ > + * directory > + */ > + bool have_multiple_policies; > > /* needed by all drivers */ > int (*init) (struct cpufreq_policy *policy); > @@ -329,6 +322,7 @@ const char *cpufreq_get_current_driver(void); > *********************************************************************/ > int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu); > int cpufreq_update_policy(unsigned int cpu); > +struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy); > > #ifdef CONFIG_CPU_FREQ > /* query the current CPU frequency (in kHz). If zero, cpufreq > couldn't detect it */ > -- > To unsubscribe from this list: send the line "unsubscribe cpufreq" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe cpufreq" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
