linaro-kernel June 2013

linaro-kernel@lists.linaro.org

89 participants
86 discussions

Start a nNew thread

A15 errata implementation

by Mark Hambleton

Hi, Does anyone know if there is a patch available for errata 801819? Thanks, Mark

11 years, 6 months

[PATCH] arm/dt: Don't add disabled CPUs to system topology

by James King

If CPUs are marked as disabled in the devicetree, make sure they do not exist in the system CPU information and CPU topology information. In this case these CPUs will not be able to be added to the system later using hot-plug. This allows a single chip with many CPUs to be easily used in a variety of hardware devices where they may have different actual processing requirements (eg for thermal/cost reasons). - Change devicetree.c to ignore any cpu nodes marked as disabled, this effectively limits the number of active cpu cores so no need for the max_cpus=x in the chosen node. - Change topology.c to ignore any cpu nodes marked as disabled, this is where the scheduler would learn about big/LITTLE cores so this effectively keeps the scheduler in sync. Signed-off-by: James King <james.king(a)linaro.org> --- Documentation/devicetree/bindings/arm/cpus.txt | 5 +++++ arch/arm/kernel/devtree.c | 6 ++++++ arch/arm/kernel/topology.c | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt index f32494d..9fbcbc5 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt @@ -45,6 +45,10 @@ For the ARM architecture every CPU node must contain the following properties: "marvell,xsc3" "marvell,xscale" +And optionally set the following properties: + +- status: can be set to "disabled" to remove that CPU from the system CPU topology + Example: cpus { @@ -73,5 +77,6 @@ Example: device_type = "cpu"; compatible = "arm,cortex-a7"; reg = <0x101>; + status = "disabled"; }; }; diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 5af04f6..f4ba8ee 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -112,6 +112,12 @@ void __init arm_dt_init_cpu_maps(void) return; /* + * Check if the cpu is marked as "disabled", if so ignore. + */ + if (!of_device_is_available(cpu)) + continue; + + /* * Duplicate MPIDRs are a recipe for disaster. * Scan all initialized entries and check for * duplicates. If any is found just bail out. diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index f10316b..90f8fb3 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -116,6 +116,10 @@ static void __init parse_dt_topology(void) if (cpu_eff->compatible == NULL) continue; + /* Check if the cpu is marked as "disabled", if so ignore. */ + if (!of_device_is_available(cn)) + continue; + rate = of_get_property(cn, "clock-frequency", &len); if (!rate || len != 4) { pr_err("%s missing clock-frequency property\n", -- 1.8.1.2

11 years, 6 months

[PATCH] cpuidle: fix ARCH_NEEDS_CPU_IDLE_COUPLED dependency warning

by Daniel Lezcano

Before the commit d6f346f2d2bf511c2c59176121a6e42ce60173a0, the ARCH_NEEDS_CPU_IDLE_COUPLED option was wrongly not depending on the CPU_IDLE and the Kconfig for OMAP / TEGRA was not checking this dependency when setting the option. With this patch, the ARCH_NEEDS_CPU_IDLE_COUPLED has been moved under the CPU_IDLE option. The dependency has been fixed in the relevant arch's Kconfig. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> --- arch/arm/mach-omap2/Kconfig | 2 +- arch/arm/mach-tegra/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index f49cd51..831e89e 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -83,7 +83,7 @@ config ARCH_OMAP4 depends on ARCH_OMAP2PLUS depends on ARCH_MULTI_V7 select ARCH_HAS_OPP - select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP + select ARCH_NEEDS_CPU_IDLE_COUPLED if (SMP && CPU_IDLE) select ARM_CPU_SUSPEND if PM select ARM_ERRATA_720789 select ARM_GIC diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 84d72fc..04c6221 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -23,7 +23,7 @@ menu "NVIDIA Tegra options" config ARCH_TEGRA_2x_SOC bool "Enable support for Tegra20 family" - select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP + select ARCH_NEEDS_CPU_IDLE_COUPLED if (SMP && CPU_IDLE) select ARM_ERRATA_720789 select ARM_ERRATA_754327 if SMP select ARM_ERRATA_764369 if SMP -- 1.7.9.5

11 years, 6 months

[RFC PATCH] arm64: add support for NEON in kernel mode

by Ard Biesheuvel

Add <asm/neon.h> containing kernel_neon_begin/kernel_neon_end function declarations and corresponding definitions in fpsimd.c These are needed to wrap uses of NEON in kernel mode. The names are identical to the ones used in arm/ so code using intrinsics or vectorized by GCC can be shared between arm and arm64. Signed-off-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> --- arch/arm64/Kconfig | 3 +++ arch/arm64/include/asm/neon.h | 14 ++++++++++++++ arch/arm64/kernel/fpsimd.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/include/asm/neon.h diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 56b3f6d..46ba680 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -95,6 +95,9 @@ config SWIOTLB config IOMMU_HELPER def_bool SWIOTLB +config KERNEL_MODE_NEON + def_bool y + source "init/Kconfig" source "kernel/Kconfig.freezer" diff --git a/arch/arm64/include/asm/neon.h b/arch/arm64/include/asm/neon.h new file mode 100644 index 0000000..b0cc58a9 --- /dev/null +++ b/arch/arm64/include/asm/neon.h @@ -0,0 +1,14 @@ +/* + * linux/arch/arm64/include/asm/neon.h + * + * Copyright (C) 2013 Linaro Ltd <ard.biesheuvel(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. + */ + +#define cpu_has_neon() (1) + +void kernel_neon_begin(void); +void kernel_neon_end(void); diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c index e8b8357..68d6caa 100644 --- a/arch/arm64/kernel/fpsimd.c +++ b/arch/arm64/kernel/fpsimd.c @@ -83,6 +83,33 @@ void fpsimd_flush_thread(void) fpsimd_load_state(&current->thread.fpsimd_state); } +#ifdef CONFIG_KERNEL_MODE_NEON + +/* + * Kernel-side NEON support functions + */ +void kernel_neon_begin(void) +{ + /* Avoid using the NEON in interrupt context */ + might_sleep(); + preempt_disable(); + + if (current->mm) + fpsimd_save_state(&current->thread.fpsimd_state); +} +EXPORT_SYMBOL(kernel_neon_begin); + +void kernel_neon_end(void) +{ + if (current->mm) + fpsimd_load_state(&current->thread.fpsimd_state); + + preempt_enable(); +} +EXPORT_SYMBOL(kernel_neon_end); + +#endif /* CONFIG_KERNEL_MODE_NEON */ + /* * FP/SIMD support code initialisation. */ @@ -103,4 +130,4 @@ static int __init fpsimd_init(void) return 0; } -late_initcall(fpsimd_init); +core_initcall(fpsimd_init); -- 1.8.1.2

11 years, 6 months

[PATCH v2 0/5] Add generic set_rate clk_ops for PLL35xx and PLL36xx for samsung SoCs

by Vikas Sajjan

This patch series does the following: 1) Factors out possible common code, unifies the clk strutures used for PLL35xx & PLL36xx and usues clk->base instead of clk->con0 2) Defines a common rate_table which will contain recommended p, m, s and k values for supported rates that needs to be changed for changing corresponding PLL's rate 3) Adds set_rate() and round_rate() clk_ops for PLL35xx and PLL36xx changes since v1: - removed sorting and bsearch - modified the definition of struct "samsung_pll_rate_table" - added generic round_rate() - rectified the ops assignment for "rate table passed as NULL" during PLL registration Is rebased on branch kgene's "for-next" https://git.kernel.org/cgit/linux/kernel/git/kgene/linux-samsung.git/log/?h… And tested these patch on chromebook for EPLL settings for Audio on our chrome tree. Vikas Sajjan (2): clk: samsung: Add set_rate() clk_ops for PLL36xx clk: samsung: Add EPLL and VPLL freq table for exynos5250 SoC Yadwinder Singh Brar (3): clk: samsung: Use clk->base instead of directly using clk->con0 for PLL3xxx clk: samsung: Add support to register rate_table for PLL3xxx clk: samsung: Add set_rate() clk_ops for PLL35xx drivers/clk/samsung/clk-exynos4.c | 10 +- drivers/clk/samsung/clk-exynos5250.c | 30 +++-- drivers/clk/samsung/clk-pll.c | 226 ++++++++++++++++++++++++++++++---- drivers/clk/samsung/clk-pll.h | 33 ++++- 4 files changed, 260 insertions(+), 39 deletions(-) -- 1.7.9.5

11 years, 6 months

[ACTIVITY] (John Stultz) June 3 - 7

by John Stultz

=== Highlights === * Sent my 3.11 queue to Thomas * Reviewed/Looked at queueing generic sched_clock logic from arch/arm * Strange 3.9.4 regression from last week ended up being a gcc issue * Reviewed blueprints and sent out weekly android upstreaming mail * Dhaval G. (Mozilla) is interested in helping with Volatile Ranges, so spent some time bringing him up to speed on volatile range work * Continued some older discussions with Minchan on volatile ranges * Started re-factoring volatile ranges patch to make shared volatility the default and private an optimization * Worked with Zoran on some new tasks (pushing wakeup_source driver enablement upstream) * Synced with AntonV on memcg pressure levels and userland low-memory killer. * Sent mail to Android devs to get their thoughts on userland low-memory killer * Pinged maintainers on KDB kiosk mode === Plans === * Continued volatile range work * Send out refactored ION patches and comments to Google devs * Finish queuing items for 3.11 * LSK / upstream review & mentoring discussions === Issues === * N/A

11 years, 6 months

Re: [PATCH 2/5] cpufreq:boost: Add support for software based CPU frequency boost

by Viresh Kumar

Hi, On 6 June 2013 12:37, Lukasz Majewski <l.majewski(a)samsung.com> wrote: > This commit adds support for software based frequency boosting. > Exynos4 SoCs (e.g. 4x12) allow setting of frequency above its normal > condition limits. This can be done for some short time. > > Overclocking (boost) support came from cpufreq driver (which is platform > dependent). Hence the data structure describing it is defined at its file. > > To allow support for either SW and HW (Intel) based boosting, the cpufreq > core code has been extended to support both solutions. > > The main boost switch has been put at /sys/devices/system/cpu/cpufreq/boost. Log requires some better paragraphs but I am not concerned about it for now. > Signed-off-by: Lukasz Majewski <l.majewski(a)samsung.com> > Signed-off-by: Myungjoo Ham <myungjoo.ham(a)samsung.com> > --- > drivers/cpufreq/cpufreq.c | 156 ++++++++++++++++++++++++++++++++++++++++++ > drivers/cpufreq/freq_table.c | 87 ++++++++++++++++++++++- > include/linux/cpufreq.h | 35 +++++++++- > 3 files changed, 275 insertions(+), 3 deletions(-) My initial view on this patch is: "It is overly engineered and needs to get simplified" > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c > index ca74e27..8cf9a92 100644 > --- a/drivers/cpufreq/cpufreq.c > +++ b/drivers/cpufreq/cpufreq.c > @@ -133,6 +133,11 @@ bool have_governor_per_policy(void) > return cpufreq_driver->have_governor_per_policy; > } > > +/** > + * Global definition of cpufreq_boost structure > + */ > +struct cpufreq_boost *cpufreq_boost; Probably just a 'static bool' here cpufreq_boost_enabled. Which takes care of selection from sysfs. > static struct cpufreq_governor *__find_governor(const char *str_governor) > { > @@ -761,6 +805,18 @@ static int cpufreq_add_dev_interface(unsigned int cpu, > if (cpufreq_set_drv_attr_files(policy, cpufreq_driver->attr)) > goto err_out_kobj_put; > > + if (cpufreq_driver->boost) { > + if (sysfs_create_file(cpufreq_global_kobject, > + &(global_boost.attr))) This will report error for systems where we have two policy structures. As we are creating something already present. > + pr_warn("could not register global boost sysfs file\n"); > + else > + pr_debug("registered global boost sysfs file\n"); Please make all your prints to print function name too: pr_debug("%s: foo\n", __func__, foo); > + if (cpufreq_set_drv_attr_files(policy, > + cpufreq_driver->boost->attr)) Why is this required? Why do we want platforms to add some files in sysfs? > /********************************************************************* > + * BOOST * > + *********************************************************************/ > +int cpufreq_boost_trigger_state(struct cpufreq_policy *policy, int state) > +{ > + struct cpufreq_boost *boost; > + unsigned long flags; > + int ret = 0; > + > + if (!policy || !policy->boost || !policy->boost->low_level_boost) > + return -ENODEV; > + > + boost = policy->boost; > + write_lock_irqsave(&cpufreq_driver_lock, flags); > + > + if (boost->status != state) { > + policy->boost->status = state; > + ret = boost->low_level_boost(policy, state); > + if (ret) { > + pr_err("BOOST cannot %sable low level code (%d)\n", > + state ? "en" : "dis", ret); > + return ret; > + } > + } > + > + write_unlock_irqrestore(&cpufreq_driver_lock, flags); > + > + pr_debug("cpufreq BOOST %sabled\n", state ? "en" : "dis"); > + > + return 0; > +} > + > +/** > + * cpufreq_boost_notifier - notifier callback for cpufreq policy change. > + * <at> nb: struct notifier_block * with callback info. > + * <at> event: value showing cpufreq event for which this function invoked. > + * <at> data: callback-specific data > + */ > +static int cpufreq_boost_notifier(struct notifier_block *nb, > + unsigned long event, void *data) > +{ > + struct cpufreq_policy *policy = data; > + > + if (event == CPUFREQ_INCOMPATIBLE) { > + if (!policy || !policy->boost) > + return -ENODEV; > + > + if (policy->boost->status == CPUFREQ_BOOST_EN) { > + pr_info("NOTIFIER BOOST: MAX: %d e:%lu cpu: %d\n", > + policy->max, event, policy->cpu); > + cpufreq_boost_trigger_state(policy, 0); > + } > + } > + > + return 0; > +} > + > +/* Notifier for cpufreq policy change */ > +static struct notifier_block cpufreq_boost_notifier_block = { > + .notifier_call = cpufreq_boost_notifier, > +}; > + > +int cpufreq_boost_init(struct cpufreq_policy *policy) > +{ > + int ret = 0; > + > + if (!policy) > + return -EINVAL; Heh, policy can't be NULL here. > + if (!cpufreq_driver->boost) { > + pr_err("Boost mode not supported on this device\n"); Wow!! You want to screw everybody else's logs with this message. Its not a crime if you don't have boost mode supported :) Actually this routine must be called only if cpufreq_driver->boost is valid. > + return -ENODEV; > + } > + > + policy->boost = cpufreq_boost = cpufreq_driver->boost; Why are we copying same pointer to policy->boost? Driver is passing pointer to a single memory location, just save it globally. > + /* disable boost for newly created policy - as we e.g. change > + governor */ > + policy->boost->status = CPUFREQ_BOOST_DIS; Drivers supporting boost may want boost to be enabled by default, maybe without any sysfs calls. > + /* register policy notifier */ > + ret = cpufreq_register_notifier(&cpufreq_boost_notifier_block, > + CPUFREQ_POLICY_NOTIFIER); > + if (ret) { > + pr_err("CPUFREQ BOOST notifier not registered.\n"); > + return ret; > + } > + /* add policy to policies list headed at struct cpufreq_boost */ > + list_add_tail(&policy->boost_list, &cpufreq_boost->policies); > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(cpufreq_boost_init); Why do we need to maintain a list of boost here? notifiers? complex :( > +/********************************************************************* > * REGISTER / UNREGISTER CPUFREQ DRIVER * > *********************************************************************/ > > @@ -1954,6 +2106,10 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver) > pr_debug("unregistering driver %s\n", driver->name); > > subsys_interface_unregister(&cpufreq_interface); > + > + if (cpufreq_driver->boost) > + sysfs_remove_file(cpufreq_global_kobject, &(global_boost.attr)); You haven't removed this from policy. Memory leak. > unregister_hotcpu_notifier(&cpufreq_cpu_notifier); > > write_lock_irqsave(&cpufreq_driver_lock, flags); > diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c > index d7a7966..0e95524 100644 > --- a/drivers/cpufreq/freq_table.c > +++ b/drivers/cpufreq/freq_table.c > @@ -3,6 +3,8 @@ > * > * Copyright (C) 2002 - 2003 Dominik Brodowski > * > + * Copyright (C) 2013 Lukasz Majewski <l.majewski(a)samsung.com> > + * You shouldn't add it unless you did some major work on this file. You aren't maintaining this file in 2013. > +static int cpufreq_frequency_table_skip_boost(struct cpufreq_policy *policy, > + unsigned int index) > +{ > + if (index == CPUFREQ_BOOST) > + if (!policy->boost || This shouldn't be true. If index has got CPUFREQ_BOOST, then driver has to support boost. > + policy->boost->status == CPUFREQ_BOOST_DIS) > + return 1; > + > + return 0; > +} > + > +unsigned int > +cpufreq_frequency_table_boost_max(struct cpufreq_frequency_table *freq_table) > +{ > + int index, boost_freq_max; > + > + for (index = 0, boost_freq_max = 0; > + freq_table[index].frequency != CPUFREQ_TABLE_END; index++) > + if (freq_table[index].index == CPUFREQ_BOOST) { > + if (freq_table[index].frequency > boost_freq_max) > + boost_freq_max = freq_table[index].frequency; > + } > + > + return boost_freq_max; > +} > +EXPORT_SYMBOL_GPL(cpufreq_frequency_table_boost_max); why do we need this? > /* > * if you use these, you must assure that the frequency table is valid > * all the time between get_attr and put_attr! > diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h > index 037d36a..1294c8c 100644 > --- a/include/linux/cpufreq.h > +++ b/include/linux/cpufreq.h > @@ -88,6 +88,25 @@ struct cpufreq_real_policy { > struct cpufreq_governor *governor; /* see below */ > }; > > +#define CPUFREQ_BOOST_DIS (0) > +#define CPUFREQ_BOOST_EN (1) You don't need these.. Just create variable as bool and 0 & 1 would be fine. > +struct cpufreq_policy; > +struct cpufreq_boost { > + unsigned int max_boost_freq; /* maximum value of > + * boosted freq */ > + unsigned int max_normal_freq; /* non boost max freq */ > + int status; /* status of boost */ > + > + /* boost sysfs attributies */ > + struct freq_attr **attr; > + > + /* low-level trigger for boost */ > + int (*low_level_boost) (struct cpufreq_policy *policy, int state); > + > + struct list_head policies; > +}; We don't need it. Just add two more fields to cpufreq_driver: - have_boost_freqs and low_level_boost (maybe a better name. What's its use?) > struct cpufreq_policy { > /* CPUs sharing clock, require sw coordination */ > cpumask_var_t cpus; /* Online CPUs only */ > @@ -113,6 +132,9 @@ struct cpufreq_policy { > > struct cpufreq_real_policy user_policy; > > + struct cpufreq_boost *boost; > + struct list_head boost_list; We don't need both of these. > struct kobject kobj; > struct completion kobj_unregister; > }; > @@ -277,7 +302,6 @@ struct cpufreq_driver { > int cpufreq_register_driver(struct cpufreq_driver *driver_data); > int cpufreq_unregister_driver(struct cpufreq_driver *driver_data); > > - ?? > void cpufreq_notify_transition(struct cpufreq_policy *policy, > struct cpufreq_freqs *freqs, unsigned int state); > > @@ -403,6 +427,9 @@ extern struct cpufreq_governor cpufreq_gov_conservative; > #define CPUFREQ_ENTRY_INVALID ~0 > #define CPUFREQ_TABLE_END ~1 > > +/* Define index for boost frequency */ > +#define CPUFREQ_BOOST ~2 s/CPUFREQ_BOOST/CPUFREQ_BOOST_FREQ

11 years, 6 months

[ACTIVITY] (Linus Walleij) 2013-06-01 - 2013-06-07

by Linus Walleij

== Linus Walleij linusw == === Highlights === * Wrote a patch series bringing runtime PM of pins into the device core. Greg and Mark ACKed it immediately so I have it queued in the pinctrl tree now. Kevin and I continue to discuss runtime PM implications and whether we can centralize it even more. This basically have activated this long-dormant blueprint: https://blueprints.launchpad.net/linux-linaro/+spec/runtimepm-pinctrl (WG leads: please approve this blueprint.) * Olof J pulled my ux500-fixes branch to ARM SoC. * Applied and queued various ux500 patches, collected ACKs and sent five (5) pull requests for the following branches on ux500: ux500-core ux500-clocksource ux500-pinctrl ux500-dma40 ux500-devicetree I also have a ux500-defconfig branch, that will be submitted later, turning on this and some more new stuff that will hit the v3.11 merge window. * Sent a pull request for the Integrator PCI DT patch series to ARM SoC. * Reviewed lots of pinctrl code. Qeueued some pinctrl patches at least. A lot of the discussion revolves around generic DT bindings for generic pin config. * Put my nose into some submarine-type review of new platforms like the Rockchip and HiSilicon. === Plans === * Finalize U300 DT+multiplatform patch set and send a pull request for it. Utilizing the syscon MFD driver this means I will actually look at regmap now! * Start to delete Integrator board files and convert to multiplatform once the PCI DT patches land in ARM SoC. * 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. === Issues === * Subsystem maintainers in the kernel community are acting like Judge Dredd on DT review and commit issues, as noted last week. * Some impediments from internal turmoil @ST-Ericsson. Thanks, Linus Walleij

11 years, 6 months

[PATCH 00/18] For-3.10: CPUFreq: Move drivers to drivers/cpufreq

by Viresh Kumar

Hi Rafael, These are all the remaining patches i have for 3.10. All of them have received Acks from their maintainers leaving powerpc ones. I have got an additional patch for powerpc (18) this time, it was the only driver left out of drivers/cpufreq. Please consider them for applying to your bleeding-edge or linux-next. -------------x--------------x------------- This patchset targets towards moving all platform specific cpufreq drivers to drivers/cpufreq. This will lead to better consolidation code in future too. All ARM and powerpc patches are compile tested by me. Changes since earlier version: - Additional patch 18/18 Viresh Kumar (18): cpufreq: ARM: Arrange drivers in alphabetical order cpufreq: tegra: Move driver to drivers/cpufreq cpufreq: davinci: move cpufreq driver to drivers/cpufreq cpufreq: pxa3xx: move cpufreq driver to drivers/cpufreq cpufreq: pxa2xx: move cpufreq driver to drivers/cpufreq cpufreq: integrator: move cpufreq driver to drivers/cpufreq cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq cpufreq: sa11x0: move cpufreq driver to drivers/cpufreq cpufreq: AVR32: move cpufreq driver to drivers/cpufreq cpufreq: blackfin: move cpufreq driver to drivers/cpufreq cpufreq: cris: move cpufreq driver to drivers/cpufreq cpufreq: ia64: move cpufreq driver to drivers/cpufreq cpufreq: mips: move cpufreq driver to drivers/cpufreq cpufreq: sh: move cpufreq driver to drivers/cpufreq cpufreq: unicore2: move cpufreq driver to drivers/cpufreq cpufreq: sparc: move cpufreq driver to drivers/cpufreq cpufreq: powerpc: move cpufreq driver to drivers/cpufreq cpufreq: powerpc/platforms/cell: move cpufreq driver to drivers/cpufreq arch/arm/Kconfig | 72 -------- arch/arm/mach-davinci/Makefile | 1 - arch/arm/mach-integrator/Makefile | 1 - arch/arm/mach-pxa/Makefile | 6 - arch/arm/mach-pxa/include/mach/generic.h | 1 + arch/arm/mach-s3c24xx/Kconfig | 66 +++----- arch/arm/mach-s3c24xx/Makefile | 6 - arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0 arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +- arch/arm/mach-sa1100/Kconfig | 26 +-- arch/arm/mach-sa1100/Makefile | 3 - arch/arm/mach-sa1100/include/mach/generic.h | 1 + arch/arm/mach-tegra/Makefile | 1 - arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 +- arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +- arch/avr32/Kconfig | 13 -- arch/avr32/configs/atngw100_defconfig | 2 +- arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +- arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +- arch/avr32/configs/atngw100_mrmt_defconfig | 2 +- arch/avr32/configs/atngw100mkii_defconfig | 2 +- .../avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +- .../avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +- arch/avr32/configs/atstk1002_defconfig | 2 +- arch/avr32/configs/atstk1003_defconfig | 2 +- arch/avr32/configs/atstk1004_defconfig | 2 +- arch/avr32/configs/atstk1006_defconfig | 2 +- arch/avr32/configs/favr-32_defconfig | 2 +- arch/avr32/configs/hammerhead_defconfig | 2 +- arch/avr32/configs/mimc200_defconfig | 2 +- arch/avr32/mach-at32ap/Makefile | 1 - arch/blackfin/mach-common/Makefile | 1 - arch/cris/arch-v32/mach-a3/Makefile | 1 - arch/cris/arch-v32/mach-fs/Makefile | 1 - arch/ia64/Kconfig | 6 +- arch/ia64/kernel/Makefile | 1 - arch/ia64/kernel/cpufreq/Kconfig | 29 ---- arch/ia64/kernel/cpufreq/Makefile | 2 - arch/mips/Kconfig | 9 +- arch/mips/kernel/Makefile | 2 - arch/mips/kernel/cpufreq/Kconfig | 41 ----- arch/mips/kernel/cpufreq/Makefile | 5 - arch/powerpc/platforms/Kconfig | 31 ---- arch/powerpc/platforms/cell/Kconfig | 26 +-- arch/powerpc/platforms/cell/Makefile | 3 - arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 - arch/sh/Kconfig | 18 -- arch/sh/kernel/Makefile | 1 - arch/sparc/Kconfig | 23 --- arch/sparc/kernel/Makefile | 3 - arch/unicore32/kernel/Makefile | 1 - drivers/cpufreq/Kconfig | 89 ++++++++++ drivers/cpufreq/Kconfig.arm | 184 ++++++++++++++------- drivers/cpufreq/Kconfig.powerpc | 44 +++++ drivers/cpufreq/Makefile | 42 ++++- .../cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c | 0 .../cpufreq/blackfin-cpufreq.c | 0 .../cpufreq/cris-artpec3-cpufreq.c | 0 .../cpufreq/cris-etraxfs-cpufreq.c | 0 .../cpufreq.c => drivers/cpufreq/davinci-cpufreq.c | 2 - .../cpufreq/ia64-acpi-cpufreq.c | 1 - .../cpu.c => drivers/cpufreq/integrator-cpufreq.c | 2 - .../kernel => drivers}/cpufreq/loongson2_cpufreq.c | 0 .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 .../cpufreq/ppc_cbe_cpufreq.c | 2 +- .../cpufreq/ppc_cbe_cpufreq_pervasive.c | 3 +- .../cpufreq/ppc_cbe_cpufreq_pmi.c | 3 +- .../cpufreq/pxa2xx-cpufreq.c | 2 - .../cpufreq/pxa3xx-cpufreq.c | 5 +- .../cpufreq/s3c2410-cpufreq.c | 0 .../cpufreq/s3c2412-cpufreq.c | 3 +- .../cpufreq/s3c2440-cpufreq.c | 0 .../cpufreq/s3c24xx-cpufreq-debugfs.c | 0 .../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0 .../cpufreq/sa1100-cpufreq.c | 3 +- .../cpufreq/sa1110-cpufreq.c | 3 +- .../cpufreq.c => drivers/cpufreq/sh-cpufreq.c | 2 - .../cpufreq/sparc-us2e-cpufreq.c | 0 .../cpufreq/sparc-us3-cpufreq.c | 0 .../cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c | 2 - .../cpufreq/unicore2-cpufreq.c | 2 +- .../linux/ppc_cbe_cpufreq.h | 4 +- 85 files changed, 385 insertions(+), 464 deletions(-) create mode 100644 arch/arm/mach-pxa/include/mach/generic.h rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%) create mode 100644 arch/arm/mach-sa1100/include/mach/generic.h delete mode 100644 arch/ia64/kernel/cpufreq/Kconfig delete mode 100644 arch/ia64/kernel/cpufreq/Makefile delete mode 100644 arch/mips/kernel/cpufreq/Kconfig delete mode 100644 arch/mips/kernel/cpufreq/Makefile rename arch/avr32/mach-at32ap/cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c (100%) rename arch/blackfin/mach-common/cpufreq.c => drivers/cpufreq/blackfin-cpufreq.c (100%) rename arch/cris/arch-v32/mach-a3/cpufreq.c => drivers/cpufreq/cris-artpec3-cpufreq.c (100%) rename arch/cris/arch-v32/mach-fs/cpufreq.c => drivers/cpufreq/cris-etraxfs-cpufreq.c (100%) rename arch/arm/mach-davinci/cpufreq.c => drivers/cpufreq/davinci-cpufreq.c (99%) rename arch/ia64/kernel/cpufreq/acpi-cpufreq.c => drivers/cpufreq/ia64-acpi-cpufreq.c (99%) rename arch/arm/mach-integrator/cpu.c => drivers/cpufreq/integrator-cpufreq.c (99%) rename {arch/mips/kernel => drivers}/cpufreq/loongson2_cpufreq.c (100%) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%) rename arch/powerpc/platforms/cell/cbe_cpufreq.c => drivers/cpufreq/ppc_cbe_cpufreq.c (99%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c => drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c (98%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c => drivers/cpufreq/ppc_cbe_cpufreq_pmi.c (99%) rename arch/arm/mach-pxa/cpufreq-pxa2xx.c => drivers/cpufreq/pxa2xx-cpufreq.c (99%) rename arch/arm/mach-pxa/cpufreq-pxa3xx.c => drivers/cpufreq/pxa3xx-cpufreq.c (98%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%) rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%) rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%) rename arch/arm/mach-sa1100/cpu-sa1100.c => drivers/cpufreq/sa1100-cpufreq.c (99%) rename arch/arm/mach-sa1100/cpu-sa1110.c => drivers/cpufreq/sa1110-cpufreq.c (99%) rename arch/sh/kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c (99%) rename arch/sparc/kernel/us2e_cpufreq.c => drivers/cpufreq/sparc-us2e-cpufreq.c (100%) rename arch/sparc/kernel/us3_cpufreq.c => drivers/cpufreq/sparc-us3-cpufreq.c (100%) rename arch/arm/mach-tegra/cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c (99%) rename arch/unicore32/kernel/cpu-ucv2.c => drivers/cpufreq/unicore2-cpufreq.c (96%) rename arch/powerpc/platforms/cell/cbe_cpufreq.h => include/linux/ppc_cbe_cpufreq.h (82%) -- 1.7.12.rc2.18.g61b472e

11 years, 6 months

[PATCH V3 1/2] cpuidle: Simplify multiple driver support

by Daniel Lezcano

Commit bf4d1b5ddb78f86078ac6ae0415802d5f0c68f92 brought the multiple driver support. The code added a couple of new API to register the driver per cpu. That led to some code complexity to handle the kernel config options when the multiple driver support is enabled or not, which is not really necessary. The code has to be compatible when the multiple driver support is not enabled, and the multiple driver support has to be compatible with the old api. This patch removes this API, which is not yet used by any driver but needed for the HMP cpuidle drivers which will come soon, and replaces its usage by a cpumask pointer in the cpuidle driver structure telling what cpus are handled by the driver. That let the API cpuidle_[un]register_driver to be used for the multiple driver support and also the cpuidle_[un]register functions, added recently in the cpuidle framework. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> --- [V3] - moved the kerneldoc and comments to a separate patch [V2]: - fixed bad refcount check - inverted clockevent notify off order at unregister time drivers/cpuidle/cpuidle.c | 4 +- drivers/cpuidle/driver.c | 196 ++++++++++++++++++--------------------------- include/linux/cpuidle.h | 21 ++--- 3 files changed, 93 insertions(+), 128 deletions(-) diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index c3a93fe..fdc432f 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -466,7 +466,7 @@ void cpuidle_unregister(struct cpuidle_driver *drv) int cpu; struct cpuidle_device *device; - for_each_possible_cpu(cpu) { + for_each_cpu(cpu, drv->cpumask) { device = &per_cpu(cpuidle_dev, cpu); cpuidle_unregister_device(device); } @@ -498,7 +498,7 @@ int cpuidle_register(struct cpuidle_driver *drv, return ret; } - for_each_possible_cpu(cpu) { + for_each_cpu(cpu, drv->cpumask) { device = &per_cpu(cpuidle_dev, cpu); device->cpu = cpu; diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 8dfaaae..745adae 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -18,167 +18,138 @@ DEFINE_SPINLOCK(cpuidle_driver_lock); -static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu); -static struct cpuidle_driver * __cpuidle_get_cpu_driver(int cpu); +#ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS -static void cpuidle_setup_broadcast_timer(void *arg) +static DEFINE_PER_CPU(struct cpuidle_driver *, cpuidle_drivers); + +static struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) { - int cpu = smp_processor_id(); - clockevents_notify((long)(arg), &cpu); + return per_cpu(cpuidle_drivers, cpu); } -static void __cpuidle_driver_init(struct cpuidle_driver *drv, int cpu) +static inline int __cpuidle_set_driver(struct cpuidle_driver *drv) { - int i; - - drv->refcnt = 0; + int cpu; - for (i = drv->state_count - 1; i >= 0 ; i--) { + for_each_cpu(cpu, drv->cpumask) { - if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP)) - continue; + if (__cpuidle_get_cpu_driver(cpu)) + return -EBUSY; - drv->bctimer = 1; - on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer, - (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1); - break; + per_cpu(cpuidle_drivers, cpu) = drv; } + + return 0; } -static int __cpuidle_register_driver(struct cpuidle_driver *drv, int cpu) +static inline void __cpuidle_unset_driver(struct cpuidle_driver *drv) { - if (!drv || !drv->state_count) - return -EINVAL; - - if (cpuidle_disabled()) - return -ENODEV; - - if (__cpuidle_get_cpu_driver(cpu)) - return -EBUSY; + int cpu; - __cpuidle_driver_init(drv, cpu); + for_each_cpu(cpu, drv->cpumask) { - __cpuidle_set_cpu_driver(drv, cpu); + if (drv != __cpuidle_get_cpu_driver(cpu)) + continue; - return 0; + per_cpu(cpuidle_drivers, cpu) = NULL; + } } -static void __cpuidle_unregister_driver(struct cpuidle_driver *drv, int cpu) -{ - if (drv != __cpuidle_get_cpu_driver(cpu)) - return; +#else - if (!WARN_ON(drv->refcnt > 0)) - __cpuidle_set_cpu_driver(NULL, cpu); +static struct cpuidle_driver *cpuidle_curr_driver; - if (drv->bctimer) { - drv->bctimer = 0; - on_each_cpu_mask(get_cpu_mask(cpu), cpuidle_setup_broadcast_timer, - (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1); - } +static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) +{ + return cpuidle_curr_driver; } -#ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS +static inline int __cpuidle_set_driver(struct cpuidle_driver *drv) +{ + if (cpuidle_curr_driver) + return -EBUSY; -static DEFINE_PER_CPU(struct cpuidle_driver *, cpuidle_drivers); + cpuidle_curr_driver = drv; -static void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu) -{ - per_cpu(cpuidle_drivers, cpu) = drv; + return 0; } -static struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) +static inline void __cpuidle_unset_driver(struct cpuidle_driver *drv) { - return per_cpu(cpuidle_drivers, cpu); + if (drv == cpuidle_curr_driver) + cpuidle_curr_driver = NULL; } -static void __cpuidle_unregister_all_cpu_driver(struct cpuidle_driver *drv) +#endif + +static void cpuidle_setup_broadcast_timer(void *arg) { - int cpu; - for_each_present_cpu(cpu) - __cpuidle_unregister_driver(drv, cpu); + int cpu = smp_processor_id(); + clockevents_notify((long)(arg), &cpu); } -static int __cpuidle_register_all_cpu_driver(struct cpuidle_driver *drv) +static int __cpuidle_driver_init(struct cpuidle_driver *drv) { - int ret = 0; - int i, cpu; + int i; - for_each_present_cpu(cpu) { - ret = __cpuidle_register_driver(drv, cpu); - if (ret) - break; - } + drv->refcnt = 0; - if (ret) - for_each_present_cpu(i) { - if (i == cpu) - break; - __cpuidle_unregister_driver(drv, i); - } + if (!drv->cpumask) + drv->cpumask = (struct cpumask *)cpu_possible_mask; + for (i = drv->state_count - 1; i >= 0 ; i--) { - return ret; + if (!(drv->states[i].flags & CPUIDLE_FLAG_TIMER_STOP)) + continue; + + drv->bctimer = 1; + break; + } + + return 0; } -int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu) +static int __cpuidle_register_driver(struct cpuidle_driver *drv) { int ret; - spin_lock(&cpuidle_driver_lock); - ret = __cpuidle_register_driver(drv, cpu); - spin_unlock(&cpuidle_driver_lock); + if (!drv || !drv->state_count) + return -EINVAL; - return ret; -} + if (cpuidle_disabled()) + return -ENODEV; -void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu) -{ - spin_lock(&cpuidle_driver_lock); - __cpuidle_unregister_driver(drv, cpu); - spin_unlock(&cpuidle_driver_lock); -} + ret = __cpuidle_driver_init(drv); + if (ret) + return ret; -/** - * cpuidle_register_driver - registers a driver - * @drv: the driver - */ -int cpuidle_register_driver(struct cpuidle_driver *drv) -{ - int ret; + ret = __cpuidle_set_driver(drv); + if (ret) + return ret; - spin_lock(&cpuidle_driver_lock); - ret = __cpuidle_register_all_cpu_driver(drv); - spin_unlock(&cpuidle_driver_lock); + if (drv->bctimer) + on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer, + (void *)CLOCK_EVT_NOTIFY_BROADCAST_ON, 1); - return ret; + return 0; } -EXPORT_SYMBOL_GPL(cpuidle_register_driver); /** * cpuidle_unregister_driver - unregisters a driver * @drv: the driver */ -void cpuidle_unregister_driver(struct cpuidle_driver *drv) +static void __cpuidle_unregister_driver(struct cpuidle_driver *drv) { - spin_lock(&cpuidle_driver_lock); - __cpuidle_unregister_all_cpu_driver(drv); - spin_unlock(&cpuidle_driver_lock); -} -EXPORT_SYMBOL_GPL(cpuidle_unregister_driver); - -#else - -static struct cpuidle_driver *cpuidle_curr_driver; + if (WARN_ON(drv->refcnt > 0)) + return; -static inline void __cpuidle_set_cpu_driver(struct cpuidle_driver *drv, int cpu) -{ - cpuidle_curr_driver = drv; -} + if (drv->bctimer) { + drv->bctimer = 0; + on_each_cpu_mask(drv->cpumask, cpuidle_setup_broadcast_timer, + (void *)CLOCK_EVT_NOTIFY_BROADCAST_OFF, 1); + } -static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) -{ - return cpuidle_curr_driver; + __cpuidle_unset_driver(drv); } /** @@ -187,13 +158,11 @@ static inline struct cpuidle_driver *__cpuidle_get_cpu_driver(int cpu) */ int cpuidle_register_driver(struct cpuidle_driver *drv) { - int ret, cpu; + int ret; - cpu = get_cpu(); spin_lock(&cpuidle_driver_lock); - ret = __cpuidle_register_driver(drv, cpu); + ret = __cpuidle_register_driver(drv); spin_unlock(&cpuidle_driver_lock); - put_cpu(); return ret; } @@ -205,16 +174,11 @@ EXPORT_SYMBOL_GPL(cpuidle_register_driver); */ void cpuidle_unregister_driver(struct cpuidle_driver *drv) { - int cpu; - - cpu = get_cpu(); spin_lock(&cpuidle_driver_lock); - __cpuidle_unregister_driver(drv, cpu); + __cpuidle_unregister_driver(drv); spin_unlock(&cpuidle_driver_lock); - put_cpu(); } EXPORT_SYMBOL_GPL(cpuidle_unregister_driver); -#endif /** * cpuidle_get_driver - return the current driver diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 8f04062..63d78b1 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -101,16 +101,20 @@ static inline int cpuidle_get_last_residency(struct cpuidle_device *dev) ****************************/ struct cpuidle_driver { - const char *name; - struct module *owner; - int refcnt; + const char *name; + struct module *owner; + int refcnt; /* used by the cpuidle framework to setup the broadcast timer */ - unsigned int bctimer:1; + unsigned int bctimer:1; + /* states array must be ordered in decreasing power consumption */ - struct cpuidle_state states[CPUIDLE_STATE_MAX]; - int state_count; - int safe_state_index; + struct cpuidle_state states[CPUIDLE_STATE_MAX]; + int state_count; + int safe_state_index; + + /* the driver handles the cpus in cpumask */ + struct cpumask *cpumask; }; #ifdef CONFIG_CPU_IDLE @@ -135,9 +139,6 @@ extern void cpuidle_disable_device(struct cpuidle_device *dev); extern int cpuidle_play_dead(void); extern struct cpuidle_driver *cpuidle_get_cpu_driver(struct cpuidle_device *dev); -extern int cpuidle_register_cpu_driver(struct cpuidle_driver *drv, int cpu); -extern void cpuidle_unregister_cpu_driver(struct cpuidle_driver *drv, int cpu); - #else static inline void disable_cpuidle(void) { } static inline int cpuidle_idle_call(void) { return -ENODEV; } -- 1.7.9.5

11 years, 6 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 June 2013