linaro-dev November 2012

linaro-dev@lists.linaro.org

70 participants
66 discussions

[PATCH V2 Resend 0/4] Create sched_select_cpu() and use it for workqueues and timers

by Viresh Kumar

Hi All, This is V2 Resend of my sched_select_cpu() work. Resend because didn't got much attention on V2. Including more guys now in cc :) In order to save power, it would be useful to schedule work onto non-IDLE cpus instead of waking up an IDLE one. To achieve this, we need scheduler to guide kernel frameworks (like: timers & workqueues) on which is the most preferred CPU that must be used for these tasks. This patchset is about implementing this concept. - The first patch adds sched_select_cpu() routine which returns the preferred cpu which is non-idle. - Second patch removes idle_cpu() calls from timer & hrtimer. - Third patch is about adapting this change in workqueue framework. - Fourth patch add migration capability in running timer Earlier discussions over v1 can be found here: http://www.mail-archive.com/linaro-dev@lists.linaro.org/msg13342.html Earlier discussions over this concept were done at last LPC: http://summit.linuxplumbersconf.org/lpc-2012/meeting/90/lpc2012-sched-timer… Module created for testing this behavior is present here: http://git.linaro.org/gitweb?p=people/vireshk/module.git;a=summary Following are the steps followed in test module: 1. Run single work on each cpu 2. This work will start a timer after x (tested with 10) jiffies of delay 3. Timer routine queues a work... (This may be called from idle or non-idle cpu) and starts the same timer again STEP 3 is done for n number of times (i.e. queuing n works, one after other) 4. All works will call a single routine, which will count following per cpu: - Total works processed by a CPU - Total works processed by a CPU, which are queued from it - Total works processed by a CPU, which aren't queued from it Setup: ----- - ARM Vexpress TC2 - big.LITTLE CPU - Core 0-1: A15, 2-4: A7 - rootfs: linaro-ubuntu-nano Results: ------- Without Workqueue Modification, i.e. PATCH 3/3: [ 2493.022335] Workqueue Analyser: works processsed by CPU0, Total: 1000, Own: 0, migrated: 0 [ 2493.047789] Workqueue Analyser: works processsed by CPU1, Total: 1000, Own: 0, migrated: 0 [ 2493.072918] Workqueue Analyser: works processsed by CPU2, Total: 1000, Own: 0, migrated: 0 [ 2493.098576] Workqueue Analyser: works processsed by CPU3, Total: 1000, Own: 0, migrated: 0 [ 2493.123702] Workqueue Analyser: works processsed by CPU4, Total: 1000, Own: 0, migrated: 0 With Workqueue Modification, i.e. PATCH 3/3: [ 2493.022335] Workqueue Analyser: works processsed by CPU0, Total: 1002, Own: 999, migrated: 3 [ 2493.047789] Workqueue Analyser: works processsed by CPU1, Total: 998, Own: 997, migrated: 1 [ 2493.072918] Workqueue Analyser: works processsed by CPU2, Total: 1013, Own: 996, migrated: 17 [ 2493.098576] Workqueue Analyser: works processsed by CPU3, Total: 998, Own: 993, migrated: 5 [ 2493.123702] Workqueue Analyser: works processsed by CPU4, Total: 989, Own: 987, migrated: 2 V2->V2-Resend ------------- - Included timer migration patch in the same thread. V1->V2 ----- - New SD_* macros removed now and earlier ones used - sched_select_cpu() rewritten and it includes the check on current cpu's idleness. - cpu_idle() calls from timer and hrtimer removed now. - Patch 2/3 from V1, removed as it doesn't apply to latest workqueue branch from tejun. - CONFIG_MIGRATE_WQ removed and so is wq_select_cpu() - sched_select_cpu() called only from __queue_work() - got tejun/for-3.7 branch in my tree, before making workqueue changes. Viresh Kumar (4): sched: Create sched_select_cpu() to give preferred CPU for power saving timer: hrtimer: Don't check idle_cpu() before calling get_nohz_timer_target() workqueue: Schedule work on non-idle cpu instead of current one timer: Migrate running timer include/linux/sched.h | 16 ++++++++++-- include/linux/timer.h | 2 ++ kernel/hrtimer.c | 2 +- kernel/sched/core.c | 69 +++++++++++++++++++++++++++++++-------------------- kernel/timer.c | 50 ++++++++++++++++++++++--------------- kernel/workqueue.c | 4 +-- 6 files changed, 91 insertions(+), 52 deletions(-) -- 1.7.12.rc2.18.g61b472e

10 years, 6 months

[PATCH] genirq: Add default affinity mask command line option

by Punit Agrawal

I am attaching a patch by Thomas Gleixner which adds a kernel command line parameter to set the defauilt IRQ affinity mask. Could you please integrate this in your tree for the next Linaro release? I've been using this patch for sometime now and it doesn't introduce any regressions. There is a possibility that this patch will make it upstream via the RT patches in the near future but in the meanwhile, we'd like to carry this patch as well. Cheers, Punit >From 52a7d44f58a262e166575abc57aa0bd3bfc8cfbb Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx(a)linutronix.de> Date: Fri, 25 May 2012 16:59:47 +0200 Subject: [PATCH] genirq: Add default affinity mask command line option If we isolate CPUs, then we don't want random device interrupts on them. Even w/o the user space irq balancer enabled we can end up with irqs on non boot cpus. Allow to restrict the default irq affinity mask. Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> --- Documentation/kernel-parameters.txt | 9 +++++++++ kernel/irq/irqdesc.c | 21 +++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 7d82468..00fedab 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1164,6 +1164,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. See comment before ip2_setup() in drivers/char/ip2/ip2base.c. + irqaffinity= [SMP] Set the default irq affinity mask + Format: + <cpu number>,...,<cpu number> + or + <cpu number>-<cpu number> + (must be a positive range in ascending order) + or a mixture + <cpu number>,...,<cpu number>-<cpu number> + irqfixup [HW] When an interrupt is not handled search all handlers for it. Intended to get systems with badly broken diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 192a302..473b2b6 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -23,10 +23,27 @@ static struct lock_class_key irq_desc_lock_class; #if defined(CONFIG_SMP) +static int __init irq_affinity_setup(char *str) +{ + zalloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); + cpulist_parse(str, irq_default_affinity); + /* + * Set at least the boot cpu. We don't want to end up with + * bugreports caused by random comandline masks + */ + cpumask_set_cpu(smp_processor_id(), irq_default_affinity); + return 1; +} +__setup("irqaffinity=", irq_affinity_setup); + static void __init init_irq_default_affinity(void) { - alloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); - cpumask_setall(irq_default_affinity); +#ifdef CONFIG_CPUMASK_OFFSTACK + if (!irq_default_affinity) + zalloc_cpumask_var(&irq_default_affinity, GFP_NOWAIT); +#endif + if (cpumask_empty(irq_default_affinity)) + cpumask_setall(irq_default_affinity); } #else static void __init init_irq_default_affinity(void) -- 1.7.9.5

10 years, 11 months

Booting linux-linaro-2.6.37 on Beagle Board

by Avik Sil

Hi, I tried booting linux-linaro-2.6.37 kernel on my beagle board C4. I executed following: 1. Installed linaro on a 4 GB SD card using linaro-image-tools 0.4.1 with hwpack daily snapshot hwpack_linaro-omap3_20110125-0_armel_supported.tar.gz and linaro-natty-headless-tar-20101202-1.tar.gz. It was booting properly on my BB. 2. Cloned linux-linaro-2.6.37. Changed to source directory 3. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- omap2plus_defconfig 4. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- menuconfig (enabled EARLY_PRINTK) 5. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- uImage 6. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules 7. make ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- modules_install INSTALL_MOD_PATH=/media/rootfs 8. cp arch/arm/boot/uImage /media/boot; sync Everything went on smoothly. Then I put the SD card on BB and powered it on. I got a kernel panic: http://paste.ubuntu.com/560562 Please help me figuring out the problem. Is it because I didn't create uInitrd? If so, then how to create it for ARM? Regards, Avik

11 years, 3 months

[PATCH v4 00/24] Introduce Xen support on ARM (based on 3.6-rc5)

by Stefano Stabellini

Hi all, this patch series implements Xen support for ARMv7 with virtualization extensions. It allows a Linux guest to boot as dom0 and as domU on Xen on ARM. PV console, disk and network frontends and backends are all working correctly. It has been tested on a Versatile Express Cortex A15 emulator, using the latest Xen ARM developement branch (git://xenbits.xen.org/people/ianc/xen-unstable.git arm-for-4.3) plus the "ARM hypercall ABI: 64 bit ready" patch series (http://marc.info/?l=xen-devel&m=134426267205408), and a simple ad-hoc tool to build guest domains (marc.info/?l=xen-devel&m=134089788016546). The patch marked with [HACK] has been dropped from this series, however you can find it here: http://marc.info/?l=linux-kernel&m=134513277823527&w=2. I am also attaching to this email the dts'es that I am currently using for dom0 and domU: vexpress-v2p-ca15-tc1.dts (that includes vexpress-v2m-rs1-rtsm.dtsi) is the dts used for dom0 and it is passed to Linux by Xen, while vexpress-virt.dts is the dts used for other domUs and it is appended in binary form to the guest kernel image. I am not sure where they are supposed to live yet, so I am just attaching them here so that people can actually try out this series if they want to. Comments are very welcome! Patch #21 "arm/v2m: initialize arch_timers even if v2m_timer is not present" touches generic ARM code and still needs to be acked/reviewed. Arnd, Russell, what do you think about this series? If you are OK with it, to whom should I submit it? Changes in v4: - rebase on 3.6-rc5; - devicetree: "xen,xen" should be last as it is less specific; - devicetree: use 2 address-cells and 2 size-cells in the reg property; - do not xs_reset_watches on dom0; - compile drivers/xen/pcpu.c only on x86; - use "+=" instead of ":=" for dom0- targets; - add a patch to update the MAINTAINERS file. Changes in v3: - move patches that have been picked up by Konrad at the end of the series; - improve comments; - add a doc to describe the Xen Device Tree format; - do not use xen_ulong_t for multicalls and apic_physbase; - add a patch at the end of the series to use the new __HVC macro; - add missing pvclock-abi.h include to ia64 header files; - do not use an anonymous union in struct xen_add_to_physmap. Changes in v2: - fix up many comments and commit messages; - remove the early_printk patches: rely on the emulated serial for now; - remove the xen_guest_init patch: without any PV early_printk, we don't need any early call to xen_guest_init, we can rely on core_initcall alone; - define an HYPERCALL macro for 5 arguments hypercall wrappers, even if at the moment is unused; - use ldm instead of pop in the hypercall wrappers; - return -ENOSYS rather than -1 from the unimplemented grant_table functions; - remove the pvclock ifdef in the Xen headers; - remove include linux/types.h from xen/interface/xen.h; - replace pr_info with pr_debug in xen_guest_init; - add a new patch to introduce xen_ulong_t and use it top replace all the occurences of unsigned long in the public Xen interface; - explicitely size all the pointers to 64 bit on ARM, so that the hypercall ABI is "64 bit ready"; - clean up xenbus_init; - make pci.o depend on CONFIG_PCI and acpi.o depend on CONFIG_ACPI; - mark Xen guest support on ARM as EXPERIMENTAL; - introduce GRANT_TABLE_PHYSADDR; - remove unneeded initialization of boot_max_nr_grant_frames; - add a new patch to clear IRQ_NOAUTOEN and IRQ_NOREQUEST in events.c; - return -EINVAL from xen_remap_domain_mfn_range if auto_translated_physmap; - retain binary compatibility in xen_add_to_physmap: use a union to introduce foreign_domid. Shortlog and diffstat: Stefano Stabellini (24): arm: initial Xen support xen/arm: hypercalls xen/arm: page.h definitions xen/arm: sync_bitops xen/arm: empty implementation of grant_table arch specific functions docs: Xen ARM DT bindings xen/arm: Xen detection and shared_info page mapping xen/arm: Introduce xen_pfn_t for pfn and mfn types xen/arm: Introduce xen_ulong_t for unsigned long xen/arm: compile and run xenbus xen: do not compile manage, balloon, pci, acpi, pcpu and cpu_hotplug on ARM xen/arm: introduce CONFIG_XEN on ARM xen/arm: get privilege status xen/arm: initialize grant_table on ARM xen/arm: receive Xen events on ARM xen: clear IRQ_NOAUTOEN and IRQ_NOREQUEST xen/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree xen: allow privcmd for HVM guests xen/arm: compile blkfront and blkback xen/arm: compile netback arm/v2m: initialize arch_timers even if v2m_timer is not present xen: missing includes xen: update xen_add_to_physmap interface MAINTAINERS: add myself as Xen ARM maintainer Documentation/devicetree/bindings/arm/xen.txt | 22 ++++ MAINTAINERS | 7 + arch/arm/Kconfig | 10 ++ arch/arm/Makefile | 1 + arch/arm/include/asm/hypervisor.h | 6 + arch/arm/include/asm/sync_bitops.h | 27 ++++ arch/arm/include/asm/xen/events.h | 18 +++ arch/arm/include/asm/xen/hypercall.h | 69 ++++++++++ arch/arm/include/asm/xen/hypervisor.h | 19 +++ arch/arm/include/asm/xen/interface.h | 73 +++++++++++ arch/arm/include/asm/xen/page.h | 82 ++++++++++++ arch/arm/mach-vexpress/v2m.c | 11 +- arch/arm/xen/Makefile | 1 + arch/arm/xen/enlighten.c | 168 +++++++++++++++++++++++++ arch/arm/xen/grant-table.c | 53 ++++++++ arch/arm/xen/hypercall.S | 106 ++++++++++++++++ arch/ia64/include/asm/xen/interface.h | 8 +- arch/x86/include/asm/xen/interface.h | 8 ++ arch/x86/xen/enlighten.c | 1 + arch/x86/xen/irq.c | 1 + arch/x86/xen/mmu.c | 3 + arch/x86/xen/xen-ops.h | 1 - drivers/block/xen-blkback/blkback.c | 1 + drivers/net/xen-netback/netback.c | 1 + drivers/net/xen-netfront.c | 1 + drivers/tty/hvc/hvc_xen.c | 2 + drivers/xen/Makefile | 13 ++- drivers/xen/events.c | 18 +++- drivers/xen/grant-table.c | 1 + drivers/xen/privcmd.c | 4 - drivers/xen/xenbus/xenbus_comms.c | 2 +- drivers/xen/xenbus/xenbus_probe.c | 62 +++++++--- drivers/xen/xenbus/xenbus_probe_frontend.c | 1 + drivers/xen/xenbus/xenbus_xs.c | 3 +- include/xen/events.h | 2 + include/xen/interface/features.h | 3 + include/xen/interface/grant_table.h | 4 +- include/xen/interface/io/protocols.h | 3 + include/xen/interface/memory.h | 21 ++-- include/xen/interface/physdev.h | 2 +- include/xen/interface/platform.h | 4 +- include/xen/interface/version.h | 2 +- include/xen/interface/xen.h | 7 +- include/xen/privcmd.h | 3 +- include/xen/xen.h | 2 +- 45 files changed, 796 insertions(+), 61 deletions(-) A branch based on 3.6-rc5 is available here: git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git 3.6-rc5-arm-4 Cheers, Stefano

11 years, 3 months

HMP patches v2

by Liviu Dudau

Hi Viresh, Here are the latest patches for HMP tunables to be included in the MP branch for the 12.11 release. They depend on Vincent Guittot's patches that you have on -exp-v12 branch which we need included in the PULL request. Testing shows that they improve power consumption for HMP. Thanks, Liviu

11 years, 3 months

[PATCH] sched/fair: Set se->vruntime directly in place_entity()

by Viresh Kumar

We are first storing the new vruntime in a variable and then storing it in se->vruntime. Simply update se->vruntime directly. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- kernel/sched/fair.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a319d56c..820a2f1 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1454,9 +1454,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) } /* ensure we never gain time by being placed backwards. */ - vruntime = max_vruntime(se->vruntime, vruntime); - - se->vruntime = vruntime; + se->vruntime = max_vruntime(se->vruntime, vruntime); } static void check_enqueue_throttle(struct cfs_rq *cfs_rq); -- 1.7.12.rc2.18.g61b472e

11 years, 3 months

[GIT PULL] cpufreq-interactive-gov-master-v1

by Viresh Kumar

Hi Andrey, This is more of announcement than a PULL request. :) Most of us are working with interactive governor. But most of us use a different version of it, as it is not yet mainlined and there is no hope of it getting mainlined. http://lists.linaro.org/pipermail/linaro-kernel/2012-February/001122.html So, we have decided to keep the latest version within Linaro and make it part of our release, so that everybody works with the same version and use it in ubuntu as well. I am keeping it in my big LITTLE MP repository in separate branches: - cpufreq-interactive-gov-master-v*: Latest version of governor from google tree - cpufreq-interactive-gov-experimental-v*: Rebased over master with updates from Linaro. This is a PULL request for master branch: -------------- The following changes since commit 9489e9dcae718d5fde988e4a684a0f55b5f94d17: Linux 3.7-rc7 (2012-11-25 17:59:19 -0800) are available in the git repository at: git://git.linaro.org/arm/big.LITTLE/mp.git cpufreq-interactive-gov-master-v1 for you to fetch changes up to 1ad5d36179224fbcdddf8abf3cbfdd183da38b3e: cpufreq: interactive: kick timer on idle exit past expiry (2012-11-29 00:48:46 +0530) ---------------------------------------------------------------- John Stultz (1): cpufreq-interactive: Compile fixup Lianwei Wang (1): cpufreq: interactive: use deferrable timer by default Mike Chan (1): cpufreq: interactive: New 'interactive' governor Sam Leffler (2): cpufreq: interactive: take idle notifications only when active cpufreq: interactive: keep freezer happy when not current governor Todd Poynor (24): Move x86_64 idle notifiers to generic ARM: Call idle notifiers ARM: Move leds idle start/stop calls to idle notifiers cpufreq interactive governor: event tracing cpufreq: interactive: apply intermediate load to max speed not current cpufreq: interactive: set at least hispeed when above hispeed load cpufreq: interactive: don't drop speed if recently at higher load cpufreq: interactive: configurable delay before raising above hispeed cpufreq: interactive: adjust code and documentation to match cpufreq: interactive: base hispeed bump on target freq, not actual cpufreq: interactive: Separate speed target revalidate time and initial set time cpufreq: interactive: Boost frequency on touchscreen input cpufreq: interactive: remove unused target_validate_time_in_idle cpufreq: interactive: Add sysfs boost interface for hints from userspace cpufreq: interactive: set floor for boosted speed cpufreq: interactive: add boost pulse interface cpufreq: interactive: restart above_hispeed_delay at each hispeed load cpufreq: interactive: fixup trace of string params cpufreq: interactive: handle speed up and down in the realtime task cpufreq: interactive: remove input_boost handling cpufreq: interactive: always limit initial speed bump to hispeed cpufreq: interactive: run at fraction of hispeed_freq when load is low cpufreq: interactive: pin timers to associated CPU cpufreq: interactive: kick timer on idle exit past expiry Documentation/cpu-freq/governors.txt | 59 +++ arch/arm/kernel/process.c | 4 +- arch/x86/include/asm/idle.h | 7 - arch/x86/kernel/process.c | 17 +- drivers/cpufreq/Kconfig | 27 ++ drivers/cpufreq/Makefile | 1 + drivers/cpufreq/cpufreq_interactive.c | 754 +++++++++++++++++++++++++++++ drivers/leds/ledtrig-cpu.c | 25 + include/linux/cpu.h | 7 + include/linux/cpufreq.h | 3 + include/trace/events/cpufreq_interactive.h | 106 ++++ kernel/cpu.c | 20 + 12 files changed, 1006 insertions(+), 24 deletions(-) create mode 100644 drivers/cpufreq/cpufreq_interactive.c create mode 100644 include/trace/events/cpufreq_interactive.h

11 years, 4 months

Planning topcs for inclusion in linux-linaro

by Jon Medhurst (Tixy)

Hi Andrey Now I'm providing a single LT topic based off linux-linaro-core-tracking (llct), and you said that you need everyone to base off the same version of llct, don't we need some kind of notification system where you announce a plan to rebuild linux-linaro and give us a version of llct to base our LT branches off? -- Tixy

11 years, 4 months

Re: [PATCH] cpuidle: reinitialize power_usage values when adding/removing C-states

by Daniel Lezcano

On 10/17/2012 12:39 AM, Julius Werner wrote: > When cpuidle drivers do not supply explicit power_usage values, > cpuidle/driver.c inserts dummy values instead. When a running processor > dynamically gains new C-states (e.g. after ACPI events), the power_usage > values of those states will stay uninitialized, and cpuidle governors > will never choose to enter them. > > This patch moves the dummy value initialization from > cpuidle_register_driver to cpuidle_enable_device, which drivers such as > acpi/processor_idle.c will call again when they add or remove C-states. > Tested and verified on an Acer AC700 Chromebook, which supports the C3 > state only when it switches from AC to battery power. > > Signed-off-by: Julius Werner <jwerner(a)chromium.org> > --- This is specific to the acpi and should be handled in the processor_idle.c file instead of the cpuidle core code. Could be the function 'acpi_processor_cst_has_changed' the right place to set a dummy power value for the power in the new C-state ? > drivers/cpuidle/cpuidle.c | 24 ++++++++++++++++++++++++ > drivers/cpuidle/driver.c | 25 ------------------------- > 2 files changed, 24 insertions(+), 25 deletions(-) > > diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c > index 7f15b85..bef3a31 100644 > --- a/drivers/cpuidle/cpuidle.c > +++ b/drivers/cpuidle/cpuidle.c > @@ -298,6 +298,28 @@ static void poll_idle_init(struct cpuidle_driver *drv) > static void poll_idle_init(struct cpuidle_driver *drv) {} > #endif /* CONFIG_ARCH_HAS_CPU_RELAX */ > > +static void set_power_states(struct cpuidle_driver *drv) > +{ > + int i; > + > + /* > + * cpuidle driver should set the drv->power_specified bit > + * before registering if the driver provides > + * power_usage numbers. > + * > + * If power_specified is not set, > + * we fill in power_usage with decreasing values as the > + * cpuidle code has an implicit assumption that state Cn > + * uses less power than C(n-1). > + * > + * With CONFIG_ARCH_HAS_CPU_RELAX, C0 is already assigned > + * an power value of -1. So we use -2, -3, etc, for other > + * c-states. > + */ > + for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) > + drv->states[i].power_usage = -1 - i; > +} > + > /** > * cpuidle_enable_device - enables idle PM for a CPU > * @dev: the CPU > @@ -330,6 +352,8 @@ int cpuidle_enable_device(struct cpuidle_device *dev) > cpuidle_enter_tk : cpuidle_enter; > > poll_idle_init(drv); > + if (!drv->power_specified) > + set_power_states(drv); > > if ((ret = cpuidle_add_state_sysfs(dev))) > return ret; > diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c > index 87db387..caaed27 100644 > --- a/drivers/cpuidle/driver.c > +++ b/drivers/cpuidle/driver.c > @@ -18,28 +18,6 @@ static struct cpuidle_driver *cpuidle_curr_driver; > DEFINE_SPINLOCK(cpuidle_driver_lock); > int cpuidle_driver_refcount; > > -static void set_power_states(struct cpuidle_driver *drv) > -{ > - int i; > - > - /* > - * cpuidle driver should set the drv->power_specified bit > - * before registering if the driver provides > - * power_usage numbers. > - * > - * If power_specified is not set, > - * we fill in power_usage with decreasing values as the > - * cpuidle code has an implicit assumption that state Cn > - * uses less power than C(n-1). > - * > - * With CONFIG_ARCH_HAS_CPU_RELAX, C0 is already assigned > - * an power value of -1. So we use -2, -3, etc, for other > - * c-states. > - */ > - for (i = CPUIDLE_DRIVER_STATE_START; i < drv->state_count; i++) > - drv->states[i].power_usage = -1 - i; > -} > - > /** > * cpuidle_register_driver - registers a driver > * @drv: the driver > @@ -58,9 +36,6 @@ int cpuidle_register_driver(struct cpuidle_driver *drv) > return -EBUSY; > } > > - if (!drv->power_specified) > - set_power_states(drv); > - > cpuidle_curr_driver = drv; > > spin_unlock(&cpuidle_driver_lock); -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog

11 years, 4 months

[PATCH] merge_config.sh: Add option to specify output dir

by Zhangfei Gao

Provide a -O option to specify dir to put generated .config Signed-off-by: Zhangfei Gao <zhangfei.gao(a)linaro.org> Tested-by: Jon Medhurst (Tixy) <tixy(a)linaro.org> --- scripts/kconfig/merge_config.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh index 974d5cb..9ad5744 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -32,11 +32,13 @@ usage() { echo " -m only merge the fragments, do not execute the make command" echo " -n use allnoconfig instead of alldefconfig" echo " -r list redundant entries when merging fragments" + echo " -O dir to put generated output files" } MAKE=true ALLTARGET=alldefconfig WARNREDUN=false +OUTPUT=. while true; do case $1 in @@ -59,6 +61,16 @@ while true; do shift continue ;; + "-O") + if [ -d $2 ];then + OUTPUT=$2 + else + echo "output directory $2 does not exist" 1>&2 + exit 1 + fi + shift 2 + continue + ;; *) break ;; @@ -100,7 +112,7 @@ for MERGE_FILE in $MERGE_LIST ; do done if [ "$MAKE" = "false" ]; then - cp $TMP_FILE .config + cp $TMP_FILE $OUTPUT/.config echo "#" echo "# merged configuration written to .config (needs make)" echo "#" @@ -111,14 +123,14 @@ fi # Use the merged file as the starting point for: # alldefconfig: Fills in any missing symbols with Kconfig default # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set -make KCONFIG_ALLCONFIG=$TMP_FILE $ALLTARGET +make KCONFIG_ALLCONFIG=$TMP_FILE O=$OUTPUT $ALLTARGET # Check all specified config values took (might have missed-dependency issues) for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE) - ACTUAL_VAL=$(grep -w -e "$CFG" .config) + ACTUAL_VAL=$(grep -w -e "$CFG" $OUTPUT/.config) if [ "x$REQUESTED_VAL" != "x$ACTUAL_VAL" ] ; then echo "Value requested for $CFG not in final .config" echo "Requested value: $REQUESTED_VAL" -- 1.7.9.5

11 years, 4 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev November 2012