| Message ID | 1447702225-13323-4-git-send-email-punit.agrawal@arm.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Tue, Nov 17, 2015 at 1:00 AM, Punit Agrawal <punit.agrawal@arm.com> wrote: > Register passive cooling devices when initialising cpufreq on > big.LITTLE systems. If the device tree provides a dynamic power > coefficient for the CPUs then the bound cooling device will support > the extensions that allow it to be used with all the existing thermal > governors including the power allocator governor. > > A cooling device will be created per individual frequency domain and > can be bound to thermal zones via the thermal DT bindings. > > Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Remind me when did I Ack this version of your patch .. > Cc: Sudeep Holla <sudeep.holla@arm.com> > Cc: Eduardo Valentin <edubezval@gmail.com> > --- > drivers/cpufreq/Kconfig.arm | 2 ++ > drivers/cpufreq/arm_big_little.c | 35 +++++++++++++++++++++++++++++++++++ > 2 files changed, 37 insertions(+) > > diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm > index 1582c1c..0e0052e 100644 > --- a/drivers/cpufreq/Kconfig.arm > +++ b/drivers/cpufreq/Kconfig.arm > @@ -6,6 +6,8 @@ > config ARM_BIG_LITTLE_CPUFREQ > tristate "Generic ARM big LITTLE CPUfreq driver" > depends on (ARM_CPU_TOPOLOGY || ARM64) && HAVE_CLK > + # if CPU_THERMAL is on and THERMAL=m, ARM_BIT_LITTLE_CPUFREQ cannot be =y > + depends on !CPU_THERMAL || THERMAL > select PM_OPP > help > This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. > diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c > index c5d256c..60d09c0 100644 > --- a/drivers/cpufreq/arm_big_little.c > +++ b/drivers/cpufreq/arm_big_little.c > @@ -23,6 +23,7 @@ > #include <linux/cpu.h> > #include <linux/cpufreq.h> > #include <linux/cpumask.h> > +#include <linux/cpu_cooling.h> > #include <linux/export.h> > #include <linux/module.h> > #include <linux/mutex.h> > @@ -55,6 +56,7 @@ static bool bL_switching_enabled; > #define ACTUAL_FREQ(cluster, freq) ((cluster == A7_CLUSTER) ? freq << 1 : freq) > #define VIRT_FREQ(cluster, freq) ((cluster == A7_CLUSTER) ? freq >> 1 : freq) > > +static struct thermal_cooling_device *cdev[MAX_CLUSTERS]; > static struct cpufreq_arm_bL_ops *arm_bL_ops; > static struct clk *clk[MAX_CLUSTERS]; > static struct cpufreq_frequency_table *freq_table[MAX_CLUSTERS + 1]; > @@ -493,6 +495,7 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy) > static int bL_cpufreq_exit(struct cpufreq_policy *policy) > { > struct device *cpu_dev; > + int domain; > > cpu_dev = get_cpu_device(policy->cpu); > if (!cpu_dev) { > @@ -501,12 +504,43 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy) > return -ENODEV; > } > > + domain = topology_physical_package_id(cpu_dev->id); And this is broken. Have you tested this for IKS ? That's what the primary use-case of this driver is. And yeah, I would like to migrate the bL usecase to cpufreq-dt, now that it can support multiple clusters. This is broken, because exit() might get called for a CPU from big cluster, while read() was called for a CPU on little cluster. -- viresh -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Viresh Kumar <viresh.kumar@linaro.org> writes: > On Tue, Nov 17, 2015 at 1:00 AM, Punit Agrawal <punit.agrawal@arm.com> wrote: >> Register passive cooling devices when initialising cpufreq on >> big.LITTLE systems. If the device tree provides a dynamic power >> coefficient for the CPUs then the bound cooling device will support >> the extensions that allow it to be used with all the existing thermal >> governors including the power allocator governor. >> >> A cooling device will be created per individual frequency domain and >> can be bound to thermal zones via the thermal DT bindings. >> >> Signed-off-by: Punit Agrawal <punit.agrawal@arm.com> >> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > > Remind me when did I Ack this version of your patch .. You didn't - I missed removing the tag before sending the patch out. Dropped locally now. > >> Cc: Sudeep Holla <sudeep.holla@arm.com> >> Cc: Eduardo Valentin <edubezval@gmail.com> >> --- >> drivers/cpufreq/Kconfig.arm | 2 ++ >> drivers/cpufreq/arm_big_little.c | 35 +++++++++++++++++++++++++++++++++++ >> 2 files changed, 37 insertions(+) >> >> diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm >> index 1582c1c..0e0052e 100644 >> --- a/drivers/cpufreq/Kconfig.arm >> +++ b/drivers/cpufreq/Kconfig.arm >> @@ -6,6 +6,8 @@ >> config ARM_BIG_LITTLE_CPUFREQ >> tristate "Generic ARM big LITTLE CPUfreq driver" >> depends on (ARM_CPU_TOPOLOGY || ARM64) && HAVE_CLK >> + # if CPU_THERMAL is on and THERMAL=m, ARM_BIT_LITTLE_CPUFREQ cannot be =y >> + depends on !CPU_THERMAL || THERMAL >> select PM_OPP >> help >> This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. >> diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c >> index c5d256c..60d09c0 100644 >> --- a/drivers/cpufreq/arm_big_little.c >> +++ b/drivers/cpufreq/arm_big_little.c >> @@ -23,6 +23,7 @@ >> #include <linux/cpu.h> >> #include <linux/cpufreq.h> >> #include <linux/cpumask.h> >> +#include <linux/cpu_cooling.h> >> #include <linux/export.h> >> #include <linux/module.h> >> #include <linux/mutex.h> >> @@ -55,6 +56,7 @@ static bool bL_switching_enabled; >> #define ACTUAL_FREQ(cluster, freq) ((cluster == A7_CLUSTER) ? freq << 1 : freq) >> #define VIRT_FREQ(cluster, freq) ((cluster == A7_CLUSTER) ? freq >> 1 : freq) >> >> +static struct thermal_cooling_device *cdev[MAX_CLUSTERS]; >> static struct cpufreq_arm_bL_ops *arm_bL_ops; >> static struct clk *clk[MAX_CLUSTERS]; >> static struct cpufreq_frequency_table *freq_table[MAX_CLUSTERS + 1]; >> @@ -493,6 +495,7 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy) >> static int bL_cpufreq_exit(struct cpufreq_policy *policy) >> { >> struct device *cpu_dev; >> + int domain; >> >> cpu_dev = get_cpu_device(policy->cpu); >> if (!cpu_dev) { >> @@ -501,12 +504,43 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy) >> return -ENODEV; >> } >> >> + domain = topology_physical_package_id(cpu_dev->id); > > And this is broken. > > Have you tested this for IKS ? That's what the primary use-case of > this driver is. Juno dvfs uses this driver - which is where I've been testing the changes. Unfortunately, there is no IKS there. > And yeah, I would like to migrate the bL usecase to cpufreq-dt, now that it can > support multiple clusters. It would be great to have a unified cpufreq driver servicing multiple dvfs domains. If I understand correctly, we can drop $SUBJECT when that happens. In the meanwhile... > > This is broken, because exit() might get called for a CPU from big > cluster, while > read() was called for a CPU on little cluster. Good catch. The patch will definitely not do the right thing when IKS is enabled. Looking at the code, it looks like you can switch in and out of IKS at run time. The cpu_cooling device doesn't cope with different types of cores, so I'll just have to skip registering (and un-registering) the cooling device when IKS is enabled. I'll send out a new version addressing the issues you've pointed out. Thanks for your comments. Punit > > -- > viresh > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 1582c1c..0e0052e 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -6,6 +6,8 @@ config ARM_BIG_LITTLE_CPUFREQ tristate "Generic ARM big LITTLE CPUfreq driver" depends on (ARM_CPU_TOPOLOGY || ARM64) && HAVE_CLK + # if CPU_THERMAL is on and THERMAL=m, ARM_BIT_LITTLE_CPUFREQ cannot be =y + depends on !CPU_THERMAL || THERMAL select PM_OPP help This enables the Generic CPUfreq driver for ARM big.LITTLE platforms. diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c index c5d256c..60d09c0 100644 --- a/drivers/cpufreq/arm_big_little.c +++ b/drivers/cpufreq/arm_big_little.c @@ -23,6 +23,7 @@ #include <linux/cpu.h> #include <linux/cpufreq.h> #include <linux/cpumask.h> +#include <linux/cpu_cooling.h> #include <linux/export.h> #include <linux/module.h> #include <linux/mutex.h> @@ -55,6 +56,7 @@ static bool bL_switching_enabled; #define ACTUAL_FREQ(cluster, freq) ((cluster == A7_CLUSTER) ? freq << 1 : freq) #define VIRT_FREQ(cluster, freq) ((cluster == A7_CLUSTER) ? freq >> 1 : freq) +static struct thermal_cooling_device *cdev[MAX_CLUSTERS]; static struct cpufreq_arm_bL_ops *arm_bL_ops; static struct clk *clk[MAX_CLUSTERS]; static struct cpufreq_frequency_table *freq_table[MAX_CLUSTERS + 1]; @@ -493,6 +495,7 @@ static int bL_cpufreq_init(struct cpufreq_policy *policy) static int bL_cpufreq_exit(struct cpufreq_policy *policy) { struct device *cpu_dev; + int domain; cpu_dev = get_cpu_device(policy->cpu); if (!cpu_dev) { @@ -501,12 +504,43 @@ static int bL_cpufreq_exit(struct cpufreq_policy *policy) return -ENODEV; } + domain = topology_physical_package_id(cpu_dev->id); + cpufreq_cooling_unregister(cdev[domain]); + cdev[domain] = NULL; + put_cluster_clk_and_freq_table(cpu_dev); dev_dbg(cpu_dev, "%s: Exited, cpu: %d\n", __func__, policy->cpu); return 0; } +static void bL_cpufreq_ready(struct cpufreq_policy *policy) +{ + struct device *cpu_dev = get_cpu_device(policy->cpu); + struct device_node *np = of_node_get(cpu_dev->of_node); + int domain = topology_physical_package_id(cpu_dev->id); + + if (WARN_ON(!np)) + return; + + if (of_find_property(np, "#cooling-cells", NULL)) { + u32 power_coefficient = 0; + + of_property_read_u32(np, "dynamic-power-coefficient", + &power_coefficient); + + cdev[domain] = of_cpufreq_power_cooling_register(np, + policy->related_cpus, power_coefficient, NULL); + if (IS_ERR(cdev[domain])) { + dev_err(cpu_dev, + "running cpufreq without cooling device: %ld\n", + PTR_ERR(cdev[domain])); + cdev[domain] = NULL; + } + } + of_node_put(np); +} + static struct cpufreq_driver bL_cpufreq_driver = { .name = "arm-big-little", .flags = CPUFREQ_STICKY | @@ -517,6 +551,7 @@ static struct cpufreq_driver bL_cpufreq_driver = { .get = bL_cpufreq_get_rate, .init = bL_cpufreq_init, .exit = bL_cpufreq_exit, + .ready = bL_cpufreq_ready, .attr = cpufreq_generic_attr, };