linaro-kernel March 2013

linaro-kernel@lists.linaro.org

83 participants
82 discussions

[PATCH 0/2] Add devfreq runtime pm support

by Rajagopal Venkat

Patch to bind devfreq to runtime pm framework. The device devfreq is automatically suspended with pm_runtime_suspend() and resumed with pm_runtime_resume(). Discussed at http://comments.gmane.org/gmane.linux.linaro.devel/13787 Rajagopal Venkat (2): PM / devfreq: Fix compiler warnings PM / devfreq: tie suspend/resume to runtime-pm drivers/base/power/runtime.c | 18 ++++++++++++++- drivers/devfreq/devfreq.c | 51 ++++++++++++++++++++++++++++++++++++++---- include/linux/devfreq.h | 30 +++++++++---------------- include/linux/pm.h | 2 ++ 4 files changed, 76 insertions(+), 25 deletions(-) -- 1.7.10.4

11 years, 9 months

[PATCH] cpufreq: acpi-cpufreq: Don't set policy->related_cpus from .init()

by Viresh Kumar

With the addition of following patch: fcf8058 cpufreq: Simplify cpufreq_add_dev() cpufreq driver's .init() routine must initialize policy->cpus with mask of all possible cpus (Online + Offline) that share the clock. Then the core would copy this mask onto policy->related_cpus and will reset policy->cpus to carry only online cpus. acpi-cpufreq driver wasn't updated with this assumption and so sometimes when we try to hot[un]plug cpus at run time, sysfs directories gets corrupted. This patch fixes acpi-cpufreq driver against this corruption. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> Tested-by: Maciej Rutecki <maciej.rutecki(a)gmail.com> --- drivers/cpufreq/acpi-cpufreq.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index afbef9c..11b8b4b 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -723,7 +723,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) policy->shared_type == CPUFREQ_SHARED_TYPE_ANY) { cpumask_copy(policy->cpus, perf->shared_cpu_map); } - cpumask_copy(policy->related_cpus, perf->shared_cpu_map); #ifdef CONFIG_SMP dmi_check_system(sw_any_bug_dmi_table); @@ -735,7 +734,6 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) if (check_amd_hwpstate_cpu(cpu) && !acpi_pstate_strict) { cpumask_clear(policy->cpus); cpumask_set_cpu(cpu, policy->cpus); - cpumask_copy(policy->related_cpus, cpu_sibling_mask(cpu)); policy->shared_type = CPUFREQ_SHARED_TYPE_HW; pr_info_once(PFX "overriding BIOS provided _PSD data\n"); } -- 1.7.12.rc2.18.g61b472e

11 years, 9 months

Re: linaro-kernel Digest, Vol 26, Issue 60

by vipzrx

On Sat 23 Mar 2013 06:52:36 AM CST, linaro-kernel-request(a)lists.linaro.org wrote: > Send linaro-kernel mailing list submissions to > linaro-kernel(a)lists.linaro.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.linaro.org/mailman/listinfo/linaro-kernel > or, via email, send a message with subject or body 'help' to > linaro-kernel-request(a)lists.linaro.org > > You can reach the person managing the list at > linaro-kernel-owner(a)lists.linaro.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of linaro-kernel digest..." > > > Today's Topics: > > 1. Re: [PATCH V3 5/7] mmc: queue work on any cpu (Viresh Kumar) > 2. Re: [PATCH V3 5/7] mmc: queue work on any cpu (Chris Ball) > 3. Re: [PATCH V3 5/7] mmc: queue work on any cpu (Chris Ball) > 4. Re: [PATCH V3 5/7] mmc: queue work on any cpu (Chris Ball) > 5. Re: [PATCH 2/2] PM / devfreq: tie suspend/resume to > runtime-pm (Kevin Hilman) > 6. [ACTIVITY] (Linus Walleij) 2013-02-22 - 2013-03-22 (Linus Walleij) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Fri, 22 Mar 2013 22:57:49 +0530 > From: Viresh Kumar <viresh.kumar(a)linaro.org> > To: Chris Ball <cjb(a)laptop.org> > Cc: venki(a)google.com, linaro-kernel(a)lists.linaro.org, > suresh.b.siddha(a)intel.com, peterz(a)infradead.org, Liviu.Dudau(a)arm.com, > robin.randhawa(a)arm.com, linux-kernel(a)vger.kernel.org, > rostedt(a)goodmis.org, mingo(a)redhat.com, Steve.Bannister(a)arm.com, > tj(a)kernel.org, linux-mmc(a)vger.kernel.org, Arvind.Chauhan(a)arm.com, > pjt(a)google.com, linux-rt-users(a)vger.kernel.org, > charles.garcia-tobin(a)arm.com > Subject: Re: [PATCH V3 5/7] mmc: queue work on any cpu > Message-ID: > <CAKohpomqkYeMgvTpjrUjGs3md=vzguW5Ae6Snf4hzsqtQxNDOw(a)mail.gmail.com> > Content-Type: text/plain; charset=windows-1252 > > On 22 March 2013 22:56, Chris Ball <cjb(a)laptop.org> wrote: >> On Mon, Mar 18 2013, Viresh Kumar wrote: >> >> /home/cjb/git/mmc/drivers/mmc/core/core.c: In function ?mmc_schedule_delayed_work?: >> /home/cjb/git/mmc/drivers/mmc/core/core.c:88:2: error: implicit declaration of function ?queue_delayed_work_on_any_cpu? [-Werror=implicit-function-declaration] >> >> I've dropped this patch for now. This function doesn't seem to be >> defined in linux-next either. > > Hi chris, > > This patch was part of a bigger patchset which also adds this API. I > don't want you to > apply this one but just Ack here. Probably Tejun or some scheduler > maintainer will > apply it later (if they like all patches). > > > > ------------------------------ > > Message: 2 > Date: Fri, 22 Mar 2013 13:09:13 -0400 > From: Chris Ball <cjb(a)laptop.org> > To: Viresh Kumar <viresh.kumar(a)linaro.org> > Cc: venki(a)google.com, linaro-kernel(a)lists.linaro.org, > suresh.b.siddha(a)intel.com, peterz(a)infradead.org, Liviu.Dudau(a)arm.com, > robin.randhawa(a)arm.com, linux-kernel(a)vger.kernel.org, > rostedt(a)goodmis.org, mingo(a)redhat.com, Steve.Bannister(a)arm.com, > tj(a)kernel.org, linux-mmc(a)vger.kernel.org, Arvind.Chauhan(a)arm.com, > pjt(a)google.com, linux-rt-users(a)vger.kernel.org, > charles.garcia-tobin(a)arm.com > Subject: Re: [PATCH V3 5/7] mmc: queue work on any cpu > Message-ID: <87sj3nl5ty.fsf(a)octavius.laptop.org> > Content-Type: text/plain > > Hi, > > On Mon, Mar 18 2013, Viresh Kumar wrote: >> mmc uses workqueues for running mmc_rescan(). There is no real dependency of >> scheduling these on the cpu which scheduled them. >> >> On a idle system, it is observed that and idle cpu wakes up many times just to >> service this work. It would be better if we can schedule it on a cpu which isn't >> idle to save on power. >> >> By idle cpu (from scheduler's perspective) we mean: >> - Current task is idle task >> - nr_running == 0 >> - wake_list is empty >> >> This patch replaces the queue_delayed_work() with >> queue_delayed_work_on_any_cpu() siblings. >> >> This routine would look for the closest (via scheduling domains) non-idle cpu >> (non-idle from schedulers perspective). If the current cpu is not idle or all >> cpus are idle, work will be scheduled on local cpu. >> >> Cc: Chris Ball <cjb(a)laptop.org> >> Cc: linux-mmc(a)vger.kernel.org >> Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> >> --- >> drivers/mmc/core/core.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c >> index 9290bb5..adf331a 100644 >> --- a/drivers/mmc/core/core.c >> +++ b/drivers/mmc/core/core.c >> @@ -85,7 +85,7 @@ MODULE_PARM_DESC( >> static int mmc_schedule_delayed_work(struct delayed_work *work, >> unsigned long delay) >> { >> - return queue_delayed_work(workqueue, work, delay); >> + return queue_delayed_work_on_any_cpu(workqueue, work, delay); >> } >> >> /* > > Thanks, pushed to mmc-next for 3.10. > > - Chris. where can i find the kernel source for pandaboard es ?

11 years, 9 months

[ACTIVITY] (John Stultz) Mar 18-22

by John Stultz

=== Highlights === * Tixy reported issue with the linaro.android-3.9-experimental branch, and I patched it up. * Sent Tixy's issue along with other fixups I had for the linaro.android-3.9 branch to AOSP via gerrit. Arve reviewed and picked them up, so AOSP now matches our tree. * Talked with Jakub about Jira card process * Prepped and did interview #1 for the week, wrote up my summary afterwards * Did a few iterations of review with Serban on his binder patches. * Provided MikeL w/ Timezone coverage info (Linaro covers 71% of timezones, missing only 7!) * Reviewed blueprints and did weekly Android upstreaming subteam email. * Prepped, interviewed and summarized interview #2 this week. * Started reviewing and testing Minchan's latest vrange patches. Sent some questions and a small cleanup fix his way. * Took a second pass at NTP changes required for timekeeping lock hold reductions & sent to Thomas. === Plans === * Still need to sort out Linaro Connect expense reporting. * Probably more interviews, although hopefully not too much more, as they're taking up a big chunk of my time. * Send out timekeeping lock hold time reductions. * Send pull request to tglx for my 3.10 queue. * Still need to work on earlysuspend blog post. * Focus on volatile range work in prep for lsf-mm === Issues === * NA

11 years, 9 months

[ACTIVITY] (Linus Walleij) 2013-02-22 - 2013-03-22

by Linus Walleij

== Linus Walleij linusw == === Highlights === * First activity report since Linaro Connect! * Sent first batch of multiplatform patches after finally getting a few cycles to actually fix this. After that Arnd saw that there was not much left and completed the series. (Yay!) We now have ux500 booting in multiplatform config, but the exact format of the patches need to be discussed and finalized. Some guys working on the PRCMU, CPUidle and suspend drivers need to be coordinated. * Collected pinctrl fixes and new patches. * Started to churn through some of the GPIO review backlog. * Initiated a discussion on PCI and VGA consoles, which really took off. This is one of those open items, ARM PCI needs some work for sure. === Plans === * A short paternity leave 6/5->9/5 in may. * Finalize the multiplatform series, coordinate with stakeholders and send a pull request. * Convert Nomadik pinctrl driver to register GPIO ranges from the gpiochip side. * Test the PL08x patches on the Ericsson Research PB11MPCore and submit platform data for using pl08x DMA on that platform. * Look into other Ux500 stuff in need of mainlining... using an internal tracking sheet for this. * Get hands dirty with regmap. === Issues === * Things have been hectic internally at ST-Ericsson diverting me from Linaro work. Thanks, Linus Walleij

11 years, 9 months

[PATCH] cpufreq: stats: do cpufreq_cpu_put() corresponding to cpufreq_cpu_get

by Viresh Kumar

In cpufreq_stats_free_sysfs() we aren't balancing calls to cpufreq_cpu_get() with cpufreq_cpu_put(). This will never let us have ref count to policy->kobj as zero. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- drivers/cpufreq/cpufreq_stats.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index 2fd779e..bfd6273 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c @@ -180,15 +180,19 @@ static void cpufreq_stats_free_sysfs(unsigned int cpu) { struct cpufreq_policy *policy = cpufreq_cpu_get(cpu); - if (!cpufreq_frequency_get_table(cpu)) + if (!policy) return; - if (policy && !policy_is_shared(policy)) { + if (!cpufreq_frequency_get_table(cpu)) + goto put_ref; + + if (!policy_is_shared(policy)) { pr_debug("%s: Free sysfs stat\n", __func__); sysfs_remove_group(&policy->kobj, &stats_attr_group); } - if (policy) - cpufreq_cpu_put(policy); + +put_ref: + cpufreq_cpu_put(policy); } static int cpufreq_stats_create_table(struct cpufreq_policy *policy, -- 1.7.12.rc2.18.g61b472e

11 years, 9 months

[ACTIVITY] (Ulf Hansson) 2013-03-16 - 2013-03-22

by Ulf Hansson

== Ulf Hansson == === Highlights === Storage: * Reviewing patches on mmc-list. Pushed a patch related to polling card detect. * Discussing sent patchset to enable runtime pm support for mmc/sd block device. * Rework parts of the HS200 and SDR104 support in the mmc protocol layer. First part for tuning sequence done, patch will be pushed to mmc-list shortly. Clk: * Preparing patchset for upstreaming patches that will add support for abx500 clocks. * Preparing patchset to update different driver's clk support used by ux500. * Resent patches for clk_set_parent fixup. * Patches disable unprepared clocks at late init merged by Mike. * Diving into discussion around doing DVFS through the clock API. Reviewing related patches. === Plans === Storage: * Continue the work for the next item in the mmc power management blueprint. * Push patches for mmci host driver, to support UHS cards/HS200, CMD23. * Push patches for mmci host driver to extend the power management support. Context save/restore are for example missing. * Push patches for mmci host driver to add support for new STE 8540 variant. Clk: * Optimizations and bug fixes for ux500 clk implementations. === Issues === * None.

11 years, 9 months

[PATCH V2] cpufreq: ARM big LITTLE: Add generic cpufreq driver and its DT glue

by Viresh Kumar

big LITTLE is ARM's new Architecture focussing power/performance needs of modern world. More information about big LITTLE can be found here: http://www.arm.com/products/processors/technologies/biglittleprocessing.php http://lwn.net/Articles/481055/ In order to keep cpufreq support for all big LITTLE platforms simple/generic, this patch tries to add a generic cpufreq driver layer for all big LITTLE platforms. The driver is divided into two parts: - Core driver: Generic and shared across all big LITTLE SoC's - Glue drivers: Per platform drivers providing ops to the core driver This patch adds in a generic glue driver which would extract information from Device Tree. Future SoC's can either reuse the DT glue or write their own depending on the need. Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanagesha(a)arm.com> Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- V1->V2: - s/IS_ERR_OR_NULL/IS_ERR for return value of clk_get - Added "depends on HAVE_CLK" in Kconfig - Removed "default n" from Kconfig - Renamed cluster clk to "cpu-cluster.%u" and added it as dev_id instead of con_id and using clk_get_sys() instead of clk_get() - Removed setting clk to freq_table to NULL on put_clk_and_freq_table call. .../bindings/cpufreq/arm_big_little_dt.txt | 29 +++ MAINTAINERS | 11 + drivers/cpufreq/Kconfig.arm | 12 + drivers/cpufreq/Makefile | 4 + drivers/cpufreq/arm_big_little.c | 276 +++++++++++++++++++++ drivers/cpufreq/arm_big_little.h | 40 +++ drivers/cpufreq/arm_big_little_dt.c | 125 ++++++++++ 7 files changed, 497 insertions(+) create mode 100644 Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt create mode 100644 drivers/cpufreq/arm_big_little.c create mode 100644 drivers/cpufreq/arm_big_little.h create mode 100644 drivers/cpufreq/arm_big_little_dt.c diff --git a/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt b/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt new file mode 100644 index 0000000..6f534eb --- /dev/null +++ b/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt @@ -0,0 +1,29 @@ +Generic ARM big LITTLE cpufreq driver's DT glue +----------------------------------------------- + +It is DT specific glue layer for generic cpufreq driver for big LITTLE systems. + +Both required and optional properties listed below must be defined under node +cluster*. * can be 0 or 1. + +Required properties: +- freqs: List of all supported frequencies. + +Optional properties: +- clock-latency: Specify the possible maximum transition latency for clock, in + unit of nanoseconds. + +Examples: + +cluster0: cluster@0 { + .. + + freqs = <500000000 600000000 700000000 800000000 900000000 1000000000 1100000000 1200000000>; + clock-latency = <200000>; + + .. + + cores { + .. + }; +}; diff --git a/MAINTAINERS b/MAINTAINERS index 554fd30..b14b749 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2206,6 +2206,17 @@ S: Maintained F: drivers/cpufreq/ F: include/linux/cpufreq.h +CPU FREQUENCY DRIVERS - ARM BIG LITTLE +M: Viresh Kumar <viresh.kumar(a)linaro.org> +M: Sudeep KarkadaNagesha <sudeep.karkadanagesha(a)arm.com> +L: cpufreq(a)vger.kernel.org +L: linux-pm(a)vger.kernel.org +W: http://www.arm.com/products/processors/technologies/biglittleprocessing.php +S: Maintained +F: drivers/cpufreq/arm_big_little.h +F: drivers/cpufreq/arm_big_little.c +F: drivers/cpufreq/arm_big_little_dt.c + CPUID/MSR DRIVER M: "H. Peter Anvin" <hpa(a)zytor.com> S: Maintained diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 030ddf6..87b7e48 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -2,6 +2,18 @@ # ARM CPU Frequency scaling drivers # +config ARM_BIG_LITTLE_CPUFREQ + tristate + depends on ARM_CPU_TOPOLOGY + +config ARM_DT_BL_CPUFREQ + tristate "Generic ARM big LITTLE CPUfreq driver probed via DT" + select ARM_BIG_LITTLE_CPUFREQ + depends on OF && HAVE_CLK + help + This enables the Generic CPUfreq driver for ARM big.LITTLE platform. + This gets frequency tables from DT. + config ARM_OMAP2PLUS_CPUFREQ bool "TI OMAP2+" depends on ARCH_OMAP2PLUS diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 863fd18..d1b0832 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -44,6 +44,10 @@ obj-$(CONFIG_X86_INTEL_PSTATE) += intel_pstate.o ################################################################################## # ARM SoC drivers +obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ) += arm_big_little.o +# big LITTLE per platform glues. Keep DT_BL_CPUFREQ as the last entry in all big +# LITTLE drivers, so that it is probed last. +obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c new file mode 100644 index 0000000..8b8b07e --- /dev/null +++ b/drivers/cpufreq/arm_big_little.c @@ -0,0 +1,276 @@ +/* + * ARM big.LITTLE Platforms CPUFreq support + * + * Copyright (C) 2013 ARM Ltd. + * Sudeep KarkadaNagesha <sudeep.karkadanagesha(a)arm.com> + * + * Copyright (C) 2013 Linaro. + * Viresh Kumar <viresh.kumar(a)linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/clk.h> +#include <linux/cpufreq.h> +#include <linux/cpumask.h> +#include <linux/export.h> +#include <linux/of_platform.h> +#include <linux/slab.h> +#include <linux/topology.h> +#include <linux/types.h> + +#include "arm_big_little.h" + +/* Currently we support only two clusters */ +#define MAX_CLUSTERS 2 + +static struct cpufreq_arm_bL_ops *arm_bL_ops; +static struct clk *clk[MAX_CLUSTERS]; +static struct cpufreq_frequency_table *freq_table[MAX_CLUSTERS]; +static atomic_t cluster_usage[MAX_CLUSTERS] = {ATOMIC_INIT(0), ATOMIC_INIT(0)}; + +static int cpu_to_cluster(int cpu) +{ + return topology_physical_package_id(cpu); +} + +static unsigned int bL_cpufreq_get(unsigned int cpu) +{ + u32 cur_cluster = cpu_to_cluster(cpu); + + return clk_get_rate(clk[cur_cluster]) / 1000; +} + +/* Validate policy frequency range */ +static int bL_cpufreq_verify_policy(struct cpufreq_policy *policy) +{ + u32 cur_cluster = cpu_to_cluster(policy->cpu); + + return cpufreq_frequency_table_verify(policy, freq_table[cur_cluster]); +} + +/* Set clock frequency */ +static int bL_cpufreq_set_target(struct cpufreq_policy *policy, + unsigned int target_freq, unsigned int relation) +{ + struct cpufreq_freqs freqs; + u32 cpu = policy->cpu, freq_tab_idx, cur_cluster; + int ret = 0; + + cur_cluster = cpu_to_cluster(policy->cpu); + + freqs.old = bL_cpufreq_get(policy->cpu); + + /* Determine valid target frequency using freq_table */ + cpufreq_frequency_table_target(policy, freq_table[cur_cluster], + target_freq, relation, &freq_tab_idx); + freqs.new = freq_table[cur_cluster][freq_tab_idx].frequency; + + freqs.cpu = policy->cpu; + + pr_debug("%s: cpu: %d, cluster: %d, oldfreq: %d, target freq: %d, new freq: %d\n", + __func__, cpu, cur_cluster, freqs.old, target_freq, + freqs.new); + + if (freqs.old == freqs.new) + return 0; + + for_each_cpu(freqs.cpu, policy->cpus) + cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE); + + ret = clk_set_rate(clk[cur_cluster], freqs.new * 1000); + if (ret) { + pr_err("clk_set_rate failed: %d\n", ret); + return ret; + } + + policy->cur = freqs.new; + + for_each_cpu(freqs.cpu, policy->cpus) + cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE); + + return ret; +} + +/* translate the integer array into cpufreq_frequency_table entries */ +struct cpufreq_frequency_table * +arm_bL_copy_table_from_array(unsigned int *table, int count) +{ + int i; + + struct cpufreq_frequency_table *freq_table; + + pr_debug("%s: table: %p, count: %d\n", __func__, table, count); + + freq_table = kmalloc(sizeof(*freq_table) * (count + 1), GFP_KERNEL); + if (!freq_table) + return NULL; + + for (i = 0; i < count; i++) { + pr_debug("%s: index: %d, freq: %d\n", __func__, i, table[i]); + freq_table[i].index = i; + freq_table[i].frequency = table[i]; /* in kHZ */ + } + + freq_table[i].index = count; + freq_table[i].frequency = CPUFREQ_TABLE_END; + + return freq_table; +} +EXPORT_SYMBOL_GPL(arm_bL_copy_table_from_array); + +void arm_bL_free_freq_table(u32 cluster) +{ + pr_debug("%s: free freq table\n", __func__); + + kfree(freq_table[cluster]); +} +EXPORT_SYMBOL_GPL(arm_bL_free_freq_table); + +static void put_cluster_clk_and_freq_table(u32 cluster) +{ + if (!atomic_dec_return(&cluster_usage[cluster])) { + clk_put(clk[cluster]); + arm_bL_ops->put_freq_tbl(cluster); + pr_debug("%s: cluster: %d\n", __func__, cluster); + } +} + +static int get_cluster_clk_and_freq_table(u32 cluster) +{ + char name[14] = "cpu-cluster."; + int count; + + if (atomic_inc_return(&cluster_usage[cluster]) != 1) + return 0; + + freq_table[cluster] = arm_bL_ops->get_freq_tbl(cluster, &count); + if (!freq_table[cluster]) + goto atomic_dec; + + name[12] = cluster + '0'; + clk[cluster] = clk_get_sys(name, NULL); + if (!IS_ERR(clk[cluster])) { + pr_debug("%s: clk: %p & freq table: %p, cluster: %d\n", + __func__, clk[cluster], freq_table[cluster], + cluster); + return 0; + } + + arm_bL_ops->put_freq_tbl(cluster); + +atomic_dec: + atomic_dec(&cluster_usage[cluster]); + pr_err("%s: Failed to get data for cluster: %d\n", __func__, cluster); + return -ENODATA; +} + +/* Per-CPU initialization */ +static int bL_cpufreq_init(struct cpufreq_policy *policy) +{ + u32 cur_cluster = cpu_to_cluster(policy->cpu); + int result; + + result = get_cluster_clk_and_freq_table(cur_cluster); + if (result) + return result; + + result = cpufreq_frequency_table_cpuinfo(policy, + freq_table[cur_cluster]); + if (result) { + pr_err("CPU %d, cluster: %d invalid freq table\n", policy->cpu, + cur_cluster); + put_cluster_clk_and_freq_table(cur_cluster); + return result; + } + + cpufreq_frequency_table_get_attr(freq_table[cur_cluster], policy->cpu); + + policy->cpuinfo.transition_latency = + arm_bL_ops->get_transition_latency(cur_cluster); + policy->cur = bL_cpufreq_get(policy->cpu); + + cpumask_copy(policy->cpus, topology_core_cpumask(policy->cpu)); + + pr_info("CPU %d initialized\n", policy->cpu); + return 0; +} + +static int bL_cpufreq_exit(struct cpufreq_policy *policy) +{ + put_cluster_clk_and_freq_table(cpu_to_cluster(policy->cpu)); + pr_debug("%s: Exited, cpu: %d\n", __func__, policy->cpu); + + return 0; +} + +/* Export freq_table to sysfs */ +static struct freq_attr *bL_cpufreq_attr[] = { + &cpufreq_freq_attr_scaling_available_freqs, + NULL, +}; + +static struct cpufreq_driver bL_cpufreq_driver = { + .name = "arm-big-little", + .flags = CPUFREQ_STICKY, + .verify = bL_cpufreq_verify_policy, + .target = bL_cpufreq_set_target, + .get = bL_cpufreq_get, + .init = bL_cpufreq_init, + .exit = bL_cpufreq_exit, + .attr = bL_cpufreq_attr, +}; + +int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) +{ + int ret; + + if (arm_bL_ops) { + pr_debug("%s: Already registered: %s, exiting\n", __func__, + arm_bL_ops->name); + return -EBUSY; + } + + if (!ops || !strlen(ops->name) || !ops->get_freq_tbl) { + pr_err("%s: Invalid arm_bL_ops, exiting\n", __func__); + return -ENODEV; + } + + arm_bL_ops = ops; + + ret = cpufreq_register_driver(&bL_cpufreq_driver); + if (ret) { + pr_info("%s: Failed registering platform driver: %s, err: %d\n", + __func__, ops->name, ret); + arm_bL_ops = NULL; + } else { + pr_info("%s: Registered platform driver: %s\n", __func__, + ops->name); + } + + return ret; +} +EXPORT_SYMBOL_GPL(bL_cpufreq_register); + +void bL_cpufreq_unregister(struct cpufreq_arm_bL_ops *ops) +{ + if (arm_bL_ops != ops) { + pr_info("%s: Registered with: %s, can't unregister, exiting\n", + __func__, arm_bL_ops->name); + } + + cpufreq_unregister_driver(&bL_cpufreq_driver); + pr_info("%s: Un-registered platform driver: %s\n", __func__, + arm_bL_ops->name); + arm_bL_ops = NULL; +} +EXPORT_SYMBOL_GPL(bL_cpufreq_unregister); diff --git a/drivers/cpufreq/arm_big_little.h b/drivers/cpufreq/arm_big_little.h new file mode 100644 index 0000000..049e15d --- /dev/null +++ b/drivers/cpufreq/arm_big_little.h @@ -0,0 +1,40 @@ +/* + * ARM big.LITTLE platform's CPUFreq header file + * + * Copyright (C) 2013 ARM Ltd. + * Sudeep KarkadaNagesha <sudeep.karkadanagesha(a)arm.com> + * + * Copyright (C) 2013 Linaro. + * Viresh Kumar <viresh.kumar(a)linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#ifndef CPUFREQ_ARM_BIG_LITTLE_H +#define CPUFREQ_ARM_BIG_LITTLE_H + +#include <linux/cpufreq.h> +#include <linux/types.h> + +struct cpufreq_arm_bL_ops { + char name[CPUFREQ_NAME_LEN]; + u32 (*get_transition_latency)(u32 cluster); + struct cpufreq_frequency_table *(*get_freq_tbl)(u32 cluster, + int *count); + void (*put_freq_tbl)(u32 cluster); +}; + +struct cpufreq_frequency_table * +arm_bL_copy_table_from_array(unsigned int *table, int count); +void arm_bL_free_freq_table(u32 cluster); + +int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops); +void bL_cpufreq_unregister(struct cpufreq_arm_bL_ops *ops); + +#endif /* CPUFREQ_ARM_BIG_LITTLE_H */ diff --git a/drivers/cpufreq/arm_big_little_dt.c b/drivers/cpufreq/arm_big_little_dt.c new file mode 100644 index 0000000..c1eee50 --- /dev/null +++ b/drivers/cpufreq/arm_big_little_dt.c @@ -0,0 +1,125 @@ +/* + * Generic big.LITTLE CPUFreq Interface driver + * + * It provides necessary ops to arm_big_little cpufreq driver and gets + * Frequency information from Device Tree. Freq table in DT must be in KHz. + * + * Copyright (C) 2013 Linaro. + * Viresh Kumar <viresh.kumar(a)linaro.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/cpufreq.h> +#include <linux/export.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/slab.h> +#include <linux/types.h> +#include "arm_big_little.h" + +static struct cpufreq_frequency_table *generic_get_freq_tbl(u32 cluster, + int *count) +{ + struct device_node *np = NULL; + const struct property *pp; + unsigned int *table = NULL; + int cluster_id; + struct cpufreq_frequency_table *cpufreq_table; + + while ((np = of_find_node_by_name(np, "cluster"))) { + if (of_property_read_u32(np, "reg", &cluster_id)) + continue; + + if (cluster_id != cluster) + continue; + + pp = of_find_property(np, "freqs", NULL); + if (!pp) + continue; + + *count = pp->length / sizeof(u32); + if (!*count) + continue; + + table = kmalloc(sizeof(*table) * (*count), GFP_KERNEL); + if (!table) { + pr_err("%s: Failed to allocate memory for table\n", + __func__); + return NULL; + } + + of_property_read_u32_array(np, "freqs", table, *count); + break; + } + + if (!table) { + pr_err("%s: Unable to retrieve Freq table from Device Tree", + __func__); + return NULL; + } + + cpufreq_table = arm_bL_copy_table_from_array(table, *count); + kfree(table); + + return cpufreq_table; +} + +static void generic_put_freq_tbl(u32 cluster) +{ + arm_bL_free_freq_table(cluster); +} + +static u32 get_transition_latency(u32 cluster) +{ + struct device_node *np = NULL; + u32 transition_latency = CPUFREQ_ETERNAL; + int cluster_id; + + while ((np = of_find_node_by_name(np, "cluster"))) { + if (of_property_read_u32(np, "reg", &cluster_id)) + continue; + + if (cluster_id != cluster) + continue; + + of_property_read_u32(np, "clock-latency", &transition_latency); + return transition_latency; + } + + pr_err("%s: Unable to get clock-latency from DT, use CPUFREQ_ETERNAL", + __func__); + + return transition_latency; +} + +static struct cpufreq_arm_bL_ops generic_bL_ops = { + .name = "generic-bl", + .get_transition_latency = get_transition_latency, + .get_freq_tbl = generic_get_freq_tbl, + .put_freq_tbl = generic_put_freq_tbl, +}; + +static int generic_bL_init(void) +{ + return bL_cpufreq_register(&generic_bL_ops); +} +module_init(generic_bL_init); + +static void generic_bL_exit(void) +{ + return bL_cpufreq_unregister(&generic_bL_ops); +} +module_exit(generic_bL_exit); + +MODULE_DESCRIPTION("Generic ARM big LITTLE cpufreq driver"); +MODULE_LICENSE("GPL"); -- 1.7.12.rc2.18.g61b472e

11 years, 9 months

[PATCH] DMA: OF: Check properties value before running be32_to_cpup() on it

by Viresh Kumar

In of_dma_controller_register() routine we are calling of_get_property() as an parameter to be32_to_cpup(). In case the property doesn't exist we will get a crash. This patch changes this code to check if we got a valid property first and then runs be32_to_cpup() on it. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- My mails are broken, i have pushed this patch here: http://git.linaro.org/gitweb?p=people/vireshk/linux.git;a=shortlog;h=refs/h… drivers/dma/of-dma.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c index 69d04d2..09c7ad1 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c @@ -93,6 +93,7 @@ int of_dma_controller_register(struct device_node *np, { struct of_dma *ofdma; int nbcells; + const __be32 *prop; if (!np || !of_dma_xlate) { pr_err("%s: not enough information provided\n", __func__); @@ -103,8 +104,11 @@ int of_dma_controller_register(struct device_node *np, if (!ofdma) return -ENOMEM; - nbcells = be32_to_cpup(of_get_property(np, "#dma-cells", NULL)); - if (!nbcells) { + prop = of_get_property(np, "#dma-cells", NULL); + if (prop) + nbcells = be32_to_cpup(prop); + + if (!prop || !nbcells) { pr_err("%s: #dma-cells property is missing or invalid\n", __func__); kfree(ofdma); -- 1.7.12.rc2.18.g61b472e

11 years, 9 months

[PATCH] cpuidle : handle clockevent notify from the cpuidle framework

by Daniel Lezcano

When a cpu enters a deep idle state, the local timers are stopped and the time framework falls back to the timer device used as a broadcast timer. The different cpuidle drivers are calling clockevents_notify ENTER/EXIT when the idle state stops the local timer. The proposed patch introduces a new flag CPUIDLE_FLAG_TIMER_STOP to let the cpuidle framework to call clockevents_notify instead of duplicating again and again these lines in all the cpuidle drivers. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> --- drivers/cpuidle/cpuidle.c | 9 +++++++++ include/linux/cpuidle.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index eba6929..c500370 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -8,6 +8,7 @@ * This code is licenced under the GPL. */ +#include <linux/clockchips.h> #include <linux/kernel.h> #include <linux/mutex.h> #include <linux/sched.h> @@ -146,12 +147,20 @@ int cpuidle_idle_call(void) trace_cpu_idle_rcuidle(next_state, dev->cpu); + if (drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP) + clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, + &dev->cpu); + if (cpuidle_state_is_coupled(dev, drv, next_state)) entered_state = cpuidle_enter_state_coupled(dev, drv, next_state); else entered_state = cpuidle_enter_state(dev, drv, next_state); + if (drv->states[next_state].flags & CPUIDLE_FLAG_TIMER_STOP) + clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, + &dev->cpu); + trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu); /* give the governor an opportunity to reflect on the outcome */ diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 480c14d..a837b33 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -57,6 +57,7 @@ struct cpuidle_state { /* Idle State Flags */ #define CPUIDLE_FLAG_TIME_VALID (0x01) /* is residency time measurable? */ #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */ +#define CPUIDLE_FLAG_TIMER_STOP (0x04) /* timer is stopped on this state */ #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000) -- 1.7.9.5

11 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel March 2013