linaro-dev September 2012

linaro-dev@lists.linaro.org

84 participants
100 discussions

[PATCH 1/3] cpuidle : remove unused ref count function

by Daniel Lezcano

These two functions are never used. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)linaro.org> --- drivers/cpuidle/driver.c | 29 +---------------------------- include/linux/cpuidle.h | 4 ---- 2 files changed, 1 insertions(+), 32 deletions(-) diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c index 58bf3b1..40cd3f3 100644 --- a/drivers/cpuidle/driver.c +++ b/drivers/cpuidle/driver.c @@ -16,7 +16,6 @@ static struct cpuidle_driver *cpuidle_curr_driver; DEFINE_SPINLOCK(cpuidle_driver_lock); -int cpuidle_driver_refcount; static void __cpuidle_register_driver(struct cpuidle_driver *drv) { @@ -90,34 +89,8 @@ void cpuidle_unregister_driver(struct cpuidle_driver *drv) } spin_lock(&cpuidle_driver_lock); - - if (!WARN_ON(cpuidle_driver_refcount > 0)) - cpuidle_curr_driver = NULL; - + cpuidle_curr_driver = NULL; spin_unlock(&cpuidle_driver_lock); } EXPORT_SYMBOL_GPL(cpuidle_unregister_driver); - -struct cpuidle_driver *cpuidle_driver_ref(void) -{ - struct cpuidle_driver *drv; - - spin_lock(&cpuidle_driver_lock); - - drv = cpuidle_curr_driver; - cpuidle_driver_refcount++; - - spin_unlock(&cpuidle_driver_lock); - return drv; -} - -void cpuidle_driver_unref(void) -{ - spin_lock(&cpuidle_driver_lock); - - if (!WARN_ON(cpuidle_driver_refcount <= 0)) - cpuidle_driver_refcount--; - - spin_unlock(&cpuidle_driver_lock); -} diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 279b1ea..5abf62b 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -145,8 +145,6 @@ extern void disable_cpuidle(void); extern int cpuidle_idle_call(void); extern int cpuidle_register_driver(struct cpuidle_driver *drv); extern struct cpuidle_driver *cpuidle_get_driver(void); -extern struct cpuidle_driver *cpuidle_driver_ref(void); -extern void cpuidle_driver_unref(void); extern void cpuidle_unregister_driver(struct cpuidle_driver *drv); extern int cpuidle_register_device(struct cpuidle_device *dev); extern void cpuidle_unregister_device(struct cpuidle_device *dev); @@ -169,8 +167,6 @@ static inline int cpuidle_idle_call(void) { return -ENODEV; } static inline int cpuidle_register_driver(struct cpuidle_driver *drv) {return -ENODEV; } static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; } -static inline struct cpuidle_driver *cpuidle_driver_ref(void) {return NULL; } -static inline void cpuidle_driver_unref(void) {} static inline void cpuidle_unregister_driver(struct cpuidle_driver *drv) { } static inline int cpuidle_register_device(struct cpuidle_device *dev) {return -ENODEV; } -- 1.7.5.4

11 years, 8 months

[ANNOUNCE] Requesting work for the LAVA Lab

by David Zinman

In an effort to structure the demands on the LAVA lab as Linaro continues to grow and requests become more frequent, the LAVA team has put in place a process for requesting work in the LAVA lab. More platforms and devices are being added to the LAVA lab and the demands on the LAVA team are growing. With this process we hope to be able to accommodate all work requests as quickly as possible. Please see https://wiki.linaro.org/Platform/LAVA/DevOps/LavaLabProcess This is a work in progress and we invite all to comment. -- David Zinman Linaro Release Manager | Project Manager Linaro.org | Open source software for ARM SoCs

11 years, 8 months

Fwd: Linaro Website Contact

by Amber Graner

Hi all, We received this ---------- Forwarded message ---------- From: Amber Graner <amber.graner(a)linaro.org> Date: 19 September 2012 11:34 Subject: Re: Linaro Website Contact To: JunrongYe <iua038_ye(a)aw-shanghai.cn> Cc: contactus(a)linaro.org Hi JunrongYe, Thank you for your question. I have forwarded your question to the DevPlatform mailing list. We also have a #linaro IRC channel on irc.freenode.net that you can ask question in as well. You can subscribe to the Devplatform mailing list at: http://lists.linaro.org/mailman/listinfo/linaro-dev and information about this and other Linaro teams can be found at: https://wiki.linaro.org/FrontPage Thank you again, Amber On 19 September 2012 04:51, Linaro Content Management System < linaro(a)freshleafmedia.co.uk> wrote: > ** > Linaro Website Form Submission - *Contact Form* > A user has submitted the following information on the Linaro website: > > Name JunrongYe Email iua038_ye(a)aw-shanghai.cn Message I have installed > the pre-built image of ubuntu 12.08 on my OrigenBoard. At the first I > download the firmware-linux and copy the folder /ath6k/AR6003/hw2.1.1 to > the folder /etc/firmware/ on my board.Then the wifi can work well.But now > the wifi does not work.And it can not find any wireless router.At the same > time the blueetooth can not work. I want the wifi can be used for my board. > Can you help me to solve the problem. Thank you for your help. Form Url > http://www.linaro.org/contact > > > This enquiry was received via the *Contact Form* on the website: > http://www.linaro.org/contact > > Thank you, > > Linaro > -- Amber Graner User Experience and Community Specialist Linaro.org <http://www.linaro.org/>* **│ *Open source software for ARM SoCs* *** Follow *Linaro: *Facebook <http://www.facebook.com/pages/Linaro> | Twitter<http://twitter.com/#%21/linaroorg> | Blog <http://www.linaro.org/linaro-blog/> *+1.828.582.9469* cell *+1.828.395.1049* office irc: akgraner amber.graner(a)linaro.org (email and Google chat) -- Amber Graner User Experience and Community Specialist Linaro.org <http://www.linaro.org/>* **│ *Open source software for ARM SoCs* *** Follow *Linaro: *Facebook <http://www.facebook.com/pages/Linaro> | Twitter<http://twitter.com/#%21/linaroorg> | Blog <http://www.linaro.org/linaro-blog/> *+1.828.582.9469* cell *+1.828.395.1049* office irc: akgraner amber.graner(a)linaro.org (email and Google chat)

11 years, 8 months

big.LITTLE MP status Sep 18, 2012

by David Zinman

https://wiki.linaro.org/projects/big.LITTLE.MP Blueprint updates: ================ https://blueprints.launchpad.net/linaro-qa/+spec/task-placement-testing * smoke test is completed for cyclictest on Android. * cpu and thread features of sysbench required for scheduler testing currently. * Android port supports those two features * sysbench, cyclictests have been delivered from the Android team. * cyclictest: dropped realtime clock feature in Android, libnuma support removed from Android * ftrace raw data mode vs. txt mode: kernel shark only supports raw data mode. * By using sysbench and cyclictests we can create below listed loads and time interval of running. while running these tests we need to identify mechanism to instrument the kernel to identify and print, the cluster number and core number, duration on test on each core. this instrumentation has been planned at project level. so need to communicate with development team and identify the best tools to trace cpu, threads and time. Roadmap Cards ============== Technical steering committee are currently reviewing the big.LITTLE MP roadmap cards: http://cards.linaro.org/browse/CARD-189 (Mobile workload generation suite) http://cards.linaro.org/browse/CARD-190 (Improving HMP Linux scheduling) http://cards.linaro.org/browse/CARD-191 (Improving Idle frameworks in Linux) http://cards.linaro.org/browse/CARD-192 (Simplifying power management PULL request for big LITTLE MP v8 branch ==================================== * Major updates are: * Based on v3.6-rc5 * new branch from * Paulm: rcu-hotplug-v1 * vincent: scheduler-misc-v1 and sudeepk arm-multi_pmu_v1 * new version of patches from Morten: task-placement-v2 * config fragment updated for fast & slow cpu ** For more details please see: http://lists.linaro.org/pipermail/linaro-dev/2012-September/013575.html -- David Zinman Linaro Release Manager | Project Manager Linaro.org | Open source software for ARM SoCs

11 years, 8 months

Need to reflash the SPI-NOR

by srinivas reddy

Hi , I am using saberlite EVK board and try to boot form SD card. In the below link it is metioned that we need to be reflash board with a small SD card loader to support boot from SD card. https://wiki.linaro.org/Boards/MX6QSabreLite. I did as per the link but it did't work for me. I even does not have MFG tool to flash NOR. Now my board doesnt have any image it seem. it is not booting and serial console, i am not seeing any messages. Please let me where i can get the MFG tool for saberlite and pre-build image to flash my board again. please help. i am deadly need of this...... -- Thanks & Regards G.Srinivas Reddy.

11 years, 8 months

2012-09-19 Android Platform Team Meeting Agenda Posted

by Zach Pfeffer

Take a look at: https://wiki.linaro.org/Platform/Android/Meetings/2012-09-19 Feel free to add to the agenda and join us in #linaro-meeting on irc.freenode.net at 13:00 UTC on 2012/9/19. -- Zach Pfeffer Android Platform Team Lead, Linaro Platform Teams Linaro.org | Open source software for ARM SoCs Follow Linaro: http://www.facebook.com/pages/Linaro http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

11 years, 8 months

[PATCH 0/6] cpuidle : per cpu latencies

by Daniel Lezcano

Since commit 46bcfad7a819bd17ac4e831b04405152d59784ab, cpuidle: Single/Global registration of idle states we have a single registration for the cpuidle states which makes sense. But now two new architectures are coming: tegra3 and big.LITTLE. These architectures have different cpus with different caracteristics for power saving. High load => powerfull processors, idle => small processors. That implies different cpu latencies. This patchset keeps the current behavior as introduced by Deepthi without breaking the drivers and add the possibility to specify a per cpu states. * Tested on intel core 2 duo T9500 * Tested on vexpress by Lorenzo Pieralsi * Tested on tegra3 by Peter De Schrijver Daniel Lezcano (6): acpi : move the acpi_idle_driver variable declaration acpi : move cpuidle_device field out of the acpi_processor_power structure acpi : remove pointless cpuidle device state_count init cpuidle : add a pointer for cpuidle_state in the cpuidle_device cpuidle : use per cpuidle device cpu states cpuidle : add cpuidle_register_states function drivers/acpi/processor_driver.c | 2 +- drivers/acpi/processor_idle.c | 27 +++++++++++++++------- drivers/cpuidle/cpuidle.c | 42 ++++++++++++++++++++++++++++------- drivers/cpuidle/governors/ladder.c | 22 +++++++++--------- drivers/cpuidle/governors/menu.c | 8 +++--- drivers/cpuidle/sysfs.c | 3 +- include/acpi/processor.h | 3 -- include/linux/cpuidle.h | 11 ++++++-- 8 files changed, 76 insertions(+), 42 deletions(-) -- 1.7.5.4

11 years, 8 months

[PATCH v5 00/17] 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! The patch series has been rebased on Konrad's stable/for-linus-3.7 branch. Arnd, Russell, what do you think about this series? If you are OK with it, to whom should I submit it? Changes in v5: - rebase on Konrad's stable/for-linus-3.7; - add a comment about the size of the grant table memory region in the device tree documentation; - add a comment about the required presence of a GIC node in the device tree documentation; - specify that the described properties are part of a top-level "hypervisor" node in the device tree documentation; - specify #address-cells and #size-cells for the device tree example; - make XEN_DOM0 depend on XEN; - avoid "select XEN_DOM0" in XEN. 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 (17): 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_ulong_t for unsigned long 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/arm: implement alloc/free_xenballooned_pages with alloc_pages/kfree xen/arm: compile blkfront and blkback xen/arm: compile netback MAINTAINERS: add myself as Xen ARM maintainer Documentation/devicetree/bindings/arm/xen.txt | 25 ++++ 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/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 | 1 + arch/x86/include/asm/xen/interface.h | 1 + arch/x86/xen/enlighten.c | 1 + arch/x86/xen/irq.c | 1 + 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/xen/Makefile | 13 ++- drivers/xen/events.c | 17 ++- include/xen/events.h | 2 + include/xen/interface/features.h | 3 + include/xen/interface/io/protocols.h | 3 + include/xen/interface/memory.h | 12 +- include/xen/interface/physdev.h | 2 +- include/xen/interface/version.h | 2 +- include/xen/xen.h | 2 +- 32 files changed, 712 insertions(+), 17 deletions(-) A branch based on 3.6-rc5 and Konrad's stable/for-linus-3.7 is available here: git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git 3.6-rc5-arm-5 Cheers, Stefano

11 years, 8 months

[PATCH 0/3] kbuild modifications to print git commit ID

by Tushar Behera

The bootlog in Ubuntu/Android images provide minimal information about the current HEAD from which the kernel was built. This patchset enables us to get detailed version info of the kernel. Tested both on Ubuntu and Android images. Patch 1 is already submitted to kernel-build ML and has been rejected. Hence review of this patchset is required w.r.t. Android/Ubuntu LEB and linux-linaro in mind. Tushar Behera (3): kbuild: setlocalversion: ignore private tags while reporting local version kbuild: Add support to extract information about current git commit HEAD init: Add additional print for detailed kernel version Makefile | 7 +++++-- include/linux/printk.h | 1 + init/main.c | 3 +++ init/version.c | 3 +++ scripts/setlocalversion | 5 +++-- 5 files changed, 15 insertions(+), 4 deletions(-) -- 1.7.4.1

11 years, 8 months

Re: Re: Re: [PATCH 1/3] devfreq: core updates to support devices which can idle

by MyungJoo Ham

> Sender : Rajagopal Venkat<rajagopal.venkat(a)linaro.org> > Date : 2012-09-18 14:20 (GMT+09:00) > Title : Re: Re: [PATCH 1/3] devfreq: core updates to support devices which can idle > On 17 September 2012 17:46, MyungJoo Ham wrote: > >> On 10 September 2012 14:43, 함명주 wrote: > >> >> Prepare devfreq core framework to support devices which > >> >> can idle. When device idleness is detected perhaps through > >> >> runtime-pm, need some mechanism to suspend devfreq load > >> >> monitoring and resume back when device is online. Present > >> >> code continues monitoring unless device is removed from > >> >> devfreq core. > >> >> > >> >> This patch introduces following design changes, > >> >> > >> >> - use per device work instead of global work to monitor device > >> >> load. This enables suspend/resume of device devfreq and > >> >> reduces monitoring code complexity. > >> >> - decouple delayed work based load monitoring logic from core > >> >> by introducing helpers functions to be used by governors. This > >> >> provides flexibility for governors either to use delayed work > >> >> based monitoring functions or to implement their own mechanism. > >> >> - devfreq core interacts with governors via events to perform > >> >> specific actions. These events include start/stop devfreq. > >> >> This sets ground for adding suspend/resume events. > >> >> > >> >> The devfreq apis are not modified and are kept intact. > >> > > >> > Hello, > >> > > >> > Please revise locking mechanism along with event handler. > >> > > >> > It appears that we need to do mutex_lock(&devfreq->lock) before calling devfreq->governor->event_handler(); > >> > >> I don't think is the case. The governor can make use of devfreq->lock if needed. > >> Anyways, I have revised locking mechanism in v2 set. > >> > >> > Or at least, userspace_init and userspace_exit functions require mutex_lock. > >> > >> The userspace_init function is executed only when device is added to devfreq > >> framework. This function itself is creating sysfs attributes. So this should not > >> be a concern for us. > >> > >> The userspace_exit is executed when device is removed from devfreq > >> framework. sysfs_remove_group() should take care of serving any pending > >> reference to sysfs attributes before removing them. No concern here as well. > >> Am I missing something which demand locking for these functions? > >> > >> > Event_handler callback won't want the properties in devfreq to be changed externally during its execution. > >> > >> Agree. > > > > If so, the GOV_INTERVAL handler of ondemand requires mutex_lock. > > (and probably, nested mutex lock for monitor_resume) > > > I don't think so. The polling_ms value update and the GOV_INTERVAL > event are handled in store_polling_interval() i.e same caller's context. So > no reason for concern here. Also polling_ms value update and queuing > the work(using polling_ms) are synchronized. The proposed structure in this patch is: [mutex_lock] update value [mutex_unlock] ... [mutex_lock] use the updated value (including queueing the work) [mutex_unlock] It is not synchronized. If it is to be synchronized, the mutex should be kept locked. Besides, as mentioned below, in order to guarantee that the modified values related with an event trigger are kept intact for the event handlers, you need to keep the mutex locked. It may be a neglectible issue if we only consider polling_ms; however, we should never assume so because we can have custom governors and drivers. (or even more events are to be defined later) Please note that even if every devfreq driver implement mutex-lock/unlock appropriately, the consistency is not guaranteed as there is unlocked period between "update" and "read". Assuming that we are to support run-time governor changes and additional events later as discussed before, we'd better prepare this beforehand. > > > It determins next action based on the value protected by the > > devfreq lock. It won't crash the kernel and it won't happen > > often. However, it may behave incorrectly. > > > > Why don't we simply let the all the struct devfreq protected > > when the external code (governors) is probably reading/writing the > > protected values? > > > > This also guarantees that the event handler gets the exact status > > modified by the event caller. Otherwise, the event handler may > > get status different from the event caller's intention. > > > > > > Cheers! > > MyungJoo > > > > > >> > >> > > >> > Plus, please edit Documentation/ABI entry (central_polling is being removed) > >> Done. > >> > > >> > Other than that, it looks fine. > >> > > >> > Cheers! > >> > MyungJoo > >> > > >> >> > >> >> Signed-off-by: Rajagopal Venkat > >> >> --- > >> >> drivers/devfreq/devfreq.c | 376 ++++++++++-------------------- > >> >> drivers/devfreq/governor.h | 9 + > >> >> drivers/devfreq/governor_performance.c | 16 +- > >> >> drivers/devfreq/governor_powersave.c | 16 +- > >> >> drivers/devfreq/governor_simpleondemand.c | 33 +++ > >> >> drivers/devfreq/governor_userspace.c | 23 +- > >> >> include/linux/devfreq.h | 31 +-- > >> >> 7 files changed, 220 insertions(+), 284 deletions(-) > >> >> > >> >> diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c > >> >> index b146d76..be524c7 100644 > >> >> --- a/drivers/devfreq/devfreq.c > >> >> +++ b/drivers/devfreq/devfreq.c > >> >> @@ -30,17 +30,11 @@ > >> >> struct class *devfreq_class; > >> >> > >> >> /* > >> >> - * devfreq_work periodically monitors every registered device. > >> >> - * The minimum polling interval is one jiffy. The polling interval is > >> >> - * determined by the minimum polling period among all polling devfreq > >> >> - * devices. The resolution of polling interval is one jiffy. > >> >> + * devfreq core provides delayed work based load monitoring helper > >> >> + * functions. Governors can use these or can implement their own > >> >> + * monitoring mechanism. > >> >> */ > >> >> -static bool polling; > >> >> static struct workqueue_struct *devfreq_wq; > >> >> -static struct delayed_work devfreq_work; > >> >> - > >> >> -/* wait removing if this is to be removed */ > >> >> -static struct devfreq *wait_remove_device; > >> >> > >> >> /* The list of all device-devfreq */ > >> >> static LIST_HEAD(devfreq_list); > >> >> @@ -72,6 +66,8 @@ static struct devfreq *find_device_devfreq(struct device *dev) > >> >> return ERR_PTR(-ENODEV); > >> >> } > >> >> > >> >> +/* Load monitoring helper functions for governors use */ > >> >> + > >> >> /** > >> >> * update_devfreq() - Reevaluate the device and configure frequency. > >> >> * @devfreq: the devfreq instance. > >> >> @@ -121,6 +117,90 @@ int update_devfreq(struct devfreq *devfreq) > >> >> } > >> >> > >> >> /** > >> >> + * devfreq_monitor() - Periodically poll devfreq objects. > >> >> + * @work: the work struct used to run devfreq_monitor periodically. > >> >> + * > >> >> + */ > >> >> +static void devfreq_monitor(struct work_struct *work) > >> >> +{ > >> >> + int err; > >> >> + struct devfreq *devfreq = container_of(work, > >> >> + struct devfreq, work.work); > >> >> + > >> >> + mutex_lock(&devfreq->lock); > >> >> + err = update_devfreq(devfreq); > >> >> + mutex_unlock(&devfreq->lock); > >> >> + if (err) > >> >> + dev_err(&devfreq->dev, "dvfs failed with (%d) error\n", err); > >> >> + > >> >> + queue_delayed_work(devfreq_wq, &devfreq->work, > >> >> + msecs_to_jiffies(devfreq->profile->polling_ms)); > >> >> +} > >> >> + > >> >> +/** > >> >> + * devfreq_monitor_start() - Start load monitoring of devfreq instance > >> >> + * using default delayed work > >> >> + * @devfreq: the devfreq instance. > >> >> + * > >> >> + * Returns 0 if monitoring started, non-zero otherwise. > >> >> + * Note: This function is exported for governors. > >> >> + */ > >> >> +int devfreq_monitor_start(struct devfreq *devfreq) > >> >> +{ > >> >> + INIT_DEFERRABLE_WORK(&devfreq->work, devfreq_monitor); > >> >> + return !queue_delayed_work(devfreq_wq, &devfreq->work, > >> >> + msecs_to_jiffies(devfreq->profile->polling_ms)); > >> >> +} > >> >> + > >> >> +/** > >> >> + * devfreq_monitor_stop() - Stop load monitoring of a devfreq instance > >> >> + * @devfreq: the devfreq instance. > >> >> + * > >> >> + * Note: This function is exported for governors. > >> >> + */ > >> >> +void devfreq_monitor_stop(struct devfreq *devfreq) > >> >> +{ > >> >> + cancel_delayed_work_sync(&devfreq->work); > >> >> +} > >> >> + > >> >> +/** > >> >> + * devfreq_monitor_suspend() - Suspend load monitoring of a devfreq instance > >> >> + * @devfreq: the devfreq instance. > >> >> + * > >> >> + * Note: This function is exported for governors. > >> >> + */ > >> >> +int devfreq_monitor_suspend(struct devfreq *devfreq) > >> >> +{ > >> >> + int ret = -EPERM; > >> >> + > >> >> + if (delayed_work_pending(&devfreq->work)) { > >> >> + cancel_delayed_work_sync(&devfreq->work); > >> >> + ret = 0; > >> >> + } > >> >> + > >> >> + return ret; > >> >> +} > >> >> + > >> >> +/** > >> >> + * devfreq_monitor_resume() - Resume load monitoring of a devfreq instance > >> >> + * @devfreq: the devfreq instance. > >> >> + * > >> >> + * Returns 0 if monitoring re-started, non-zero otherwise. > >> >> + * Note: This function is exported for governors. > >> >> + */ > >> >> +int devfreq_monitor_resume(struct devfreq *devfreq) > >> >> +{ > >> >> + int ret = -EPERM; > >> >> + > >> >> + if (!delayed_work_pending(&devfreq->work)) { > >> >> + ret = !queue_delayed_work(devfreq_wq, &devfreq->work, > >> >> + msecs_to_jiffies(devfreq->profile->polling_ms)); > >> >> + } > >> >> + > >> >> + return ret; > >> >> +} > >> >> + > >> >> +/** > >> >> * devfreq_notifier_call() - Notify that the device frequency requirements > >> >> * has been changed out of devfreq framework. > >> >> * @nb the notifier_block (supposed to be devfreq->nb) > >> >> @@ -143,59 +223,33 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type, > >> >> } > >> >> > >> >> /** > >> >> - * _remove_devfreq() - Remove devfreq from the device. > >> >> + * _remove_devfreq() - Remove devfreq from the devfreq list and > >> >> + release its resources. > >> >> * @devfreq: the devfreq struct > >> >> * @skip: skip calling device_unregister(). > >> >> - * > >> >> - * Note that the caller should lock devfreq->lock before calling > >> >> - * this. _remove_devfreq() will unlock it and free devfreq > >> >> - * internally. devfreq_list_lock should be locked by the caller > >> >> - * as well (not relased at return) > >> >> - * > >> >> - * Lock usage: > >> >> - * devfreq->lock: locked before call. > >> >> - * unlocked at return (and freed) > >> >> - * devfreq_list_lock: locked before call. > >> >> - * kept locked at return. > >> >> - * if devfreq is centrally polled. > >> >> - * > >> >> - * Freed memory: > >> >> - * devfreq > >> >> */ > >> >> static void _remove_devfreq(struct devfreq *devfreq, bool skip) > >> >> { > >> >> - if (!mutex_is_locked(&devfreq->lock)) { > >> >> - WARN(true, "devfreq->lock must be locked by the caller.\n"); > >> >> - return; > >> >> - } > >> >> - if (!devfreq->governor->no_central_polling && > >> >> - !mutex_is_locked(&devfreq_list_lock)) { > >> >> - WARN(true, "devfreq_list_lock must be locked by the caller.\n"); > >> >> + mutex_lock(&devfreq_list_lock); > >> >> + if (IS_ERR(find_device_devfreq(devfreq->dev.parent))) { > >> >> + mutex_unlock(&devfreq_list_lock); > >> >> + dev_warn(&devfreq->dev, "releasing devfreq which doesn't exist\n"); > >> >> return; > >> >> } > >> >> + list_del(&devfreq->node); > >> >> + mutex_unlock(&devfreq_list_lock); > >> >> > >> >> - if (devfreq->being_removed) > >> >> - return; > >> >> - > >> >> - devfreq->being_removed = true; > >> >> + devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_STOP); > >> >> > >> >> if (devfreq->profile->exit) > >> >> devfreq->profile->exit(devfreq->dev.parent); > >> >> > >> >> - if (devfreq->governor->exit) > >> >> - devfreq->governor->exit(devfreq); > >> >> - > >> >> if (!skip && get_device(&devfreq->dev)) { > >> >> device_unregister(&devfreq->dev); > >> >> put_device(&devfreq->dev); > >> >> } > >> >> > >> >> - if (!devfreq->governor->no_central_polling) > >> >> - list_del(&devfreq->node); > >> >> - > >> >> - mutex_unlock(&devfreq->lock); > >> >> mutex_destroy(&devfreq->lock); > >> >> - > >> >> kfree(devfreq); > >> >> } > >> >> > >> >> @@ -210,130 +264,8 @@ static void _remove_devfreq(struct devfreq *devfreq, bool skip) > >> >> static void devfreq_dev_release(struct device *dev) > >> >> { > >> >> struct devfreq *devfreq = to_devfreq(dev); > >> >> - bool central_polling = !devfreq->governor->no_central_polling; > >> >> - > >> >> - /* > >> >> - * If devfreq_dev_release() was called by device_unregister() of > >> >> - * _remove_devfreq(), we cannot mutex_lock(&devfreq->lock) and > >> >> - * being_removed is already set. This also partially checks the case > >> >> - * where devfreq_dev_release() is called from a thread other than > >> >> - * the one called _remove_devfreq(); however, this case is > >> >> - * dealt completely with another following being_removed check. > >> >> - * > >> >> - * Because being_removed is never being > >> >> - * unset, we do not need to worry about race conditions on > >> >> - * being_removed. > >> >> - */ > >> >> - if (devfreq->being_removed) > >> >> - return; > >> >> - > >> >> - if (central_polling) > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - > >> >> - mutex_lock(&devfreq->lock); > >> >> - > >> >> - /* > >> >> - * Check being_removed flag again for the case where > >> >> - * devfreq_dev_release() was called in a thread other than the one > >> >> - * possibly called _remove_devfreq(). > >> >> - */ > >> >> - if (devfreq->being_removed) { > >> >> - mutex_unlock(&devfreq->lock); > >> >> - goto out; > >> >> - } > >> >> > >> >> - /* devfreq->lock is unlocked and removed in _removed_devfreq() */ > >> >> _remove_devfreq(devfreq, true); > >> >> - > >> >> -out: > >> >> - if (central_polling) > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> -} > >> >> - > >> >> -/** > >> >> - * devfreq_monitor() - Periodically poll devfreq objects. > >> >> - * @work: the work struct used to run devfreq_monitor periodically. > >> >> - * > >> >> - */ > >> >> -static void devfreq_monitor(struct work_struct *work) > >> >> -{ > >> >> - static unsigned long last_polled_at; > >> >> - struct devfreq *devfreq, *tmp; > >> >> - int error; > >> >> - unsigned long jiffies_passed; > >> >> - unsigned long next_jiffies = ULONG_MAX, now = jiffies; > >> >> - struct device *dev; > >> >> - > >> >> - /* Initially last_polled_at = 0, polling every device at bootup */ > >> >> - jiffies_passed = now - last_polled_at; > >> >> - last_polled_at = now; > >> >> - if (jiffies_passed == 0) > >> >> - jiffies_passed = 1; > >> >> - > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - list_for_each_entry_safe(devfreq, tmp, &devfreq_list, node) { > >> >> - mutex_lock(&devfreq->lock); > >> >> - dev = devfreq->dev.parent; > >> >> - > >> >> - /* Do not remove tmp for a while */ > >> >> - wait_remove_device = tmp; > >> >> - > >> >> - if (devfreq->governor->no_central_polling || > >> >> - devfreq->next_polling == 0) { > >> >> - mutex_unlock(&devfreq->lock); > >> >> - continue; > >> >> - } > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> - > >> >> - /* > >> >> - * Reduce more next_polling if devfreq_wq took an extra > >> >> - * delay. (i.e., CPU has been idled.) > >> >> - */ > >> >> - if (devfreq->next_polling <= jiffies_passed) { > >> >> - error = update_devfreq(devfreq); > >> >> - > >> >> - /* Remove a devfreq with an error. */ > >> >> - if (error && error != -EAGAIN) { > >> >> - > >> >> - dev_err(dev, "Due to update_devfreq error(%d), devfreq(%s) is removed from the device\n", > >> >> - error, devfreq->governor->name); > >> >> - > >> >> - /* > >> >> - * Unlock devfreq before locking the list > >> >> - * in order to avoid deadlock with > >> >> - * find_device_devfreq or others > >> >> - */ > >> >> - mutex_unlock(&devfreq->lock); > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - /* Check if devfreq is already removed */ > >> >> - if (IS_ERR(find_device_devfreq(dev))) > >> >> - continue; > >> >> - mutex_lock(&devfreq->lock); > >> >> - /* This unlocks devfreq->lock and free it */ > >> >> - _remove_devfreq(devfreq, false); > >> >> - continue; > >> >> - } > >> >> - devfreq->next_polling = devfreq->polling_jiffies; > >> >> - } else { > >> >> - devfreq->next_polling -= jiffies_passed; > >> >> - } > >> >> - > >> >> - if (devfreq->next_polling) > >> >> - next_jiffies = (next_jiffies > devfreq->next_polling) ? > >> >> - devfreq->next_polling : next_jiffies; > >> >> - > >> >> - mutex_unlock(&devfreq->lock); > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - } > >> >> - wait_remove_device = NULL; > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> - > >> >> - if (next_jiffies > 0 && next_jiffies < ULONG_MAX) { > >> >> - polling = true; > >> >> - queue_delayed_work(devfreq_wq, &devfreq_work, next_jiffies); > >> >> - } else { > >> >> - polling = false; > >> >> - } > >> >> } > >> >> > >> >> /** > >> >> @@ -357,16 +289,13 @@ struct devfreq *devfreq_add_device(struct device *dev, > >> >> return ERR_PTR(-EINVAL); > >> >> } > >> >> > >> >> - > >> >> - if (!governor->no_central_polling) { > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - devfreq = find_device_devfreq(dev); > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> - if (!IS_ERR(devfreq)) { > >> >> - dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__); > >> >> - err = -EINVAL; > >> >> - goto err_out; > >> >> - } > >> >> + mutex_lock(&devfreq_list_lock); > >> >> + devfreq = find_device_devfreq(dev); > >> >> + mutex_unlock(&devfreq_list_lock); > >> >> + if (!IS_ERR(devfreq)) { > >> >> + dev_err(dev, "%s: Unable to create devfreq for the device. It already has one.\n", __func__); > >> >> + err = -EINVAL; > >> >> + goto err_out; > >> >> } > >> >> > >> >> devfreq = kzalloc(sizeof(struct devfreq), GFP_KERNEL); > >> >> @@ -386,48 +315,40 @@ struct devfreq *devfreq_add_device(struct device *dev, > >> >> devfreq->governor = governor; > >> >> devfreq->previous_freq = profile->initial_freq; > >> >> devfreq->data = data; > >> >> - devfreq->next_polling = devfreq->polling_jiffies > >> >> - = msecs_to_jiffies(devfreq->profile->polling_ms); > >> >> devfreq->nb.notifier_call = devfreq_notifier_call; > >> >> > >> >> dev_set_name(&devfreq->dev, dev_name(dev)); > >> >> err = device_register(&devfreq->dev); > >> >> if (err) { > >> >> put_device(&devfreq->dev); > >> >> + mutex_unlock(&devfreq->lock); > >> >> goto err_dev; > >> >> } > >> >> > >> >> - if (governor->init) > >> >> - err = governor->init(devfreq); > >> >> - if (err) > >> >> - goto err_init; > >> >> - > >> >> mutex_unlock(&devfreq->lock); > >> >> > >> >> - if (governor->no_central_polling) > >> >> - goto out; > >> >> - > >> >> mutex_lock(&devfreq_list_lock); > >> >> - > >> >> list_add(&devfreq->node, &devfreq_list); > >> >> + mutex_unlock(&devfreq_list_lock); > >> >> > >> >> - if (devfreq_wq && devfreq->next_polling && !polling) { > >> >> - polling = true; > >> >> - queue_delayed_work(devfreq_wq, &devfreq_work, > >> >> - devfreq->next_polling); > >> >> + err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START); > >> >> + if (err) { > >> >> + dev_err(dev, "%s: Unable to start governor for the device\n", > >> >> + __func__); > >> >> + goto err_init; > >> >> } > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> -out: > >> >> + > >> >> return devfreq; > >> >> > >> >> err_init: > >> >> + list_del(&devfreq->node); > >> >> device_unregister(&devfreq->dev); > >> >> err_dev: > >> >> - mutex_unlock(&devfreq->lock); > >> >> kfree(devfreq); > >> >> err_out: > >> >> return ERR_PTR(err); > >> >> } > >> >> +EXPORT_SYMBOL(devfreq_add_device); > >> >> > >> >> /** > >> >> * devfreq_remove_device() - Remove devfreq feature from a device. > >> >> @@ -435,30 +356,14 @@ err_out: > >> >> */ > >> >> int devfreq_remove_device(struct devfreq *devfreq) > >> >> { > >> >> - bool central_polling; > >> >> - > >> >> if (!devfreq) > >> >> return -EINVAL; > >> >> > >> >> - central_polling = !devfreq->governor->no_central_polling; > >> >> - > >> >> - if (central_polling) { > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - while (wait_remove_device == devfreq) { > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> - schedule(); > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - } > >> >> - } > >> >> - > >> >> - mutex_lock(&devfreq->lock); > >> >> - _remove_devfreq(devfreq, false); /* it unlocks devfreq->lock */ > >> >> - > >> >> - if (central_polling) > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> + _remove_devfreq(devfreq, false); > >> >> > >> >> return 0; > >> >> } > >> >> +EXPORT_SYMBOL(devfreq_remove_device); > >> >> > >> >> static ssize_t show_governor(struct device *dev, > >> >> struct device_attribute *attr, char *buf) > >> >> @@ -492,33 +397,15 @@ static ssize_t store_polling_interval(struct device *dev, > >> >> > >> >> mutex_lock(&df->lock); > >> >> df->profile->polling_ms = value; > >> >> - df->next_polling = df->polling_jiffies > >> >> - = msecs_to_jiffies(value); > >> >> mutex_unlock(&df->lock); > >> >> > >> >> + df->governor->event_handler(df, DEVFREQ_GOV_INTERVAL); > >> >> ret = count; > >> >> > >> >> - if (df->governor->no_central_polling) > >> >> - goto out; > >> >> - > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - if (df->next_polling > 0 && !polling) { > >> >> - polling = true; > >> >> - queue_delayed_work(devfreq_wq, &devfreq_work, > >> >> - df->next_polling); > >> >> - } > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> out: > >> >> return ret; > >> >> } > >> >> > >> >> -static ssize_t show_central_polling(struct device *dev, > >> >> - struct device_attribute *attr, char *buf) > >> >> -{ > >> >> - return sprintf(buf, "%d\n", > >> >> - !to_devfreq(dev)->governor->no_central_polling); > >> >> -} > >> >> - > >> >> static ssize_t store_min_freq(struct device *dev, struct device_attribute *attr, > >> >> const char *buf, size_t count) > >> >> { > >> >> @@ -590,7 +477,6 @@ static ssize_t show_max_freq(struct device *dev, struct device_attribute *attr, > >> >> static struct device_attribute devfreq_attrs[] = { > >> >> __ATTR(governor, S_IRUGO, show_governor, NULL), > >> >> __ATTR(cur_freq, S_IRUGO, show_freq, NULL), > >> >> - __ATTR(central_polling, S_IRUGO, show_central_polling, NULL), > >> >> __ATTR(polling_interval, S_IRUGO | S_IWUSR, show_polling_interval, > >> >> store_polling_interval), > >> >> __ATTR(min_freq, S_IRUGO | S_IWUSR, show_min_freq, store_min_freq), > >> >> @@ -598,23 +484,6 @@ static struct device_attribute devfreq_attrs[] = { > >> >> { }, > >> >> }; > >> >> > >> >> -/** > >> >> - * devfreq_start_polling() - Initialize data structure for devfreq framework and > >> >> - * start polling registered devfreq devices. > >> >> - */ > >> >> -static int __init devfreq_start_polling(void) > >> >> -{ > >> >> - mutex_lock(&devfreq_list_lock); > >> >> - polling = false; > >> >> - devfreq_wq = create_freezable_workqueue("devfreq_wq"); > >> >> - INIT_DEFERRABLE_WORK(&devfreq_work, devfreq_monitor); > >> >> - mutex_unlock(&devfreq_list_lock); > >> >> - > >> >> - devfreq_monitor(&devfreq_work.work); > >> >> - return 0; > >> >> -} > >> >> -late_initcall(devfreq_start_polling); > >> >> - > >> >> static int __init devfreq_init(void) > >> >> { > >> >> devfreq_class = class_create(THIS_MODULE, "devfreq"); > >> >> @@ -622,7 +491,15 @@ static int __init devfreq_init(void) > >> >> pr_err("%s: couldn't create class\n", __FILE__); > >> >> return PTR_ERR(devfreq_class); > >> >> } > >> >> + > >> >> + devfreq_wq = create_freezable_workqueue("devfreq_wq"); > >> >> + if (IS_ERR(devfreq_wq)) { > >> >> + class_destroy(devfreq_class); > >> >> + pr_err("%s: couldn't create workqueue\n", __FILE__); > >> >> + return PTR_ERR(devfreq_wq); > >> >> + } > >> >> devfreq_class->dev_attrs = devfreq_attrs; > >> >> + > >> >> return 0; > >> >> } > >> >> subsys_initcall(devfreq_init); > >> >> @@ -630,6 +507,7 @@ subsys_initcall(devfreq_init); > >> >> static void __exit devfreq_exit(void) > >> >> { > >> >> class_destroy(devfreq_class); > >> >> + destroy_workqueue(devfreq_wq); > >> >> } > >> >> module_exit(devfreq_exit); > >> >> > >> >> diff --git a/drivers/devfreq/governor.h b/drivers/devfreq/governor.h > >> >> index ea7f13c..4a86af7 100644 > >> >> --- a/drivers/devfreq/governor.h > >> >> +++ b/drivers/devfreq/governor.h > >> >> @@ -18,7 +18,16 @@ > >> >> > >> >> #define to_devfreq(DEV) container_of((DEV), struct devfreq, dev) > >> >> > >> >> +/* Devfreq events */ > >> >> +#define DEVFREQ_GOV_START 0x1 > >> >> +#define DEVFREQ_GOV_STOP 0x2 > >> >> +#define DEVFREQ_GOV_INTERVAL 0x3 > >> >> + > >> >> /* Caution: devfreq->lock must be locked before calling update_devfreq */ > >> >> extern int update_devfreq(struct devfreq *devfreq); > >> >> > >> >> +extern int devfreq_monitor_start(struct devfreq *devfreq); > >> >> +extern void devfreq_monitor_stop(struct devfreq *devfreq); > >> >> +extern int devfreq_monitor_suspend(struct devfreq *devfreq); > >> >> +extern int devfreq_monitor_resume(struct devfreq *devfreq); > >> >> #endif /* _GOVERNOR_H */ > >> >> diff --git a/drivers/devfreq/governor_performance.c b/drivers/devfreq/governor_performance.c > >> >> index af75ddd..b657eff 100644 > >> >> --- a/drivers/devfreq/governor_performance.c > >> >> +++ b/drivers/devfreq/governor_performance.c > >> >> @@ -26,14 +26,22 @@ static int devfreq_performance_func(struct devfreq *df, > >> >> return 0; > >> >> } > >> >> > >> >> -static int performance_init(struct devfreq *devfreq) > >> >> +static int devfreq_performance_handler(struct devfreq *devfreq, > >> >> + unsigned int event) > >> >> { > >> >> - return update_devfreq(devfreq); > >> >> + int ret = 0; > >> >> + > >> >> + if (event == DEVFREQ_GOV_START) { > >> >> + mutex_lock(&devfreq->lock); > >> >> + ret = update_devfreq(devfreq); > >> >> + mutex_unlock(&devfreq->lock); > >> >> + } > >> >> + > >> >> + return ret; > >> >> } > >> >> > >> >> const struct devfreq_governor devfreq_performance = { > >> >> .name = "performance", > >> >> - .init = performance_init, > >> >> .get_target_freq = devfreq_performance_func, > >> >> - .no_central_polling = true, > >> >> + .event_handler = devfreq_performance_handler, > >> >> }; > >> >> diff --git a/drivers/devfreq/governor_powersave.c b/drivers/devfreq/governor_powersave.c > >> >> index fec0cdb..daa5732 100644 > >> >> --- a/drivers/devfreq/governor_powersave.c > >> >> +++ b/drivers/devfreq/governor_powersave.c > >> >> @@ -23,14 +23,22 @@ static int devfreq_powersave_func(struct devfreq *df, > >> >> return 0; > >> >> } > >> >> > >> >> -static int powersave_init(struct devfreq *devfreq) > >> >> +static int devfreq_powersave_handler(struct devfreq *devfreq, > >> >> + unsigned int event) > >> >> { > >> >> - return update_devfreq(devfreq); > >> >> + int ret = 0; > >> >> + > >> >> + if (event == DEVFREQ_GOV_START) { > >> >> + mutex_lock(&devfreq->lock); > >> >> + ret = update_devfreq(devfreq); > >> >> + mutex_unlock(&devfreq->lock); > >> >> + } > >> >> + > >> >> + return ret; > >> >> } > >> >> > >> >> const struct devfreq_governor devfreq_powersave = { > >> >> .name = "powersave", > >> >> - .init = powersave_init, > >> >> .get_target_freq = devfreq_powersave_func, > >> >> - .no_central_polling = true, > >> >> + .event_handler = devfreq_powersave_handler, > >> >> }; > >> >> diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c > >> >> index a2e3eae..9802bf9 100644 > >> >> --- a/drivers/devfreq/governor_simpleondemand.c > >> >> +++ b/drivers/devfreq/governor_simpleondemand.c > >> >> @@ -12,6 +12,7 @@ > >> >> #include > >> >> #include > >> >> #include > >> >> +#include "governor.h" > >> >> > >> >> /* Default constants for DevFreq-Simple-Ondemand (DFSO) */ > >> >> #define DFSO_UPTHRESHOLD (90) > >> >> @@ -88,7 +89,39 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, > >> >> return 0; > >> >> } > >> >> > >> >> +int devfreq_simple_ondemand_handler(struct devfreq *devfreq, > >> >> + unsigned int event) > >> >> +{ > >> >> + int ret = 0; > >> >> + > >> >> + switch (event) { > >> >> + case DEVFREQ_GOV_START: > >> >> + ret = devfreq_monitor_start(devfreq); > >> >> + break; > >> >> + > >> >> + case DEVFREQ_GOV_STOP: > >> >> + devfreq_monitor_stop(devfreq); > >> >> + break; > >> >> + > >> >> + case DEVFREQ_GOV_INTERVAL: > >> >> + /* > >> >> + * if polling interval is set to zero, stop monitoring. > >> >> + * otherwise resume load monitoring. > >> >> + */ > >> >> + if (!devfreq->profile->polling_ms) > >> >> + ret = devfreq_monitor_suspend(devfreq); > >> >> + else > >> >> + ret = devfreq_monitor_resume(devfreq); > >> >> + break; > >> >> + default: > >> >> + break; > >> >> + } > >> >> + > >> >> + return ret; > >> >> +} > >> >> + > >> >> const struct devfreq_governor devfreq_simple_ondemand = { > >> >> .name = "simple_ondemand", > >> >> .get_target_freq = devfreq_simple_ondemand_func, > >> >> + .event_handler = devfreq_simple_ondemand_handler, > >> >> }; > >> >> diff --git a/drivers/devfreq/governor_userspace.c b/drivers/devfreq/governor_userspace.c > >> >> index 0681246..c48fca0 100644 > >> >> --- a/drivers/devfreq/governor_userspace.c > >> >> +++ b/drivers/devfreq/governor_userspace.c > >> >> @@ -116,10 +116,27 @@ static void userspace_exit(struct devfreq *devfreq) > >> >> devfreq->data = NULL; > >> >> } > >> >> > >> >> +int devfreq_userspace_handler(struct devfreq *devfreq, > >> >> + unsigned int event) > >> >> +{ > >> >> + int ret = 0; > >> >> + > >> >> + switch (event) { > >> >> + case DEVFREQ_GOV_START: > >> >> + ret = userspace_init(devfreq); > >> >> + break; > >> >> + case DEVFREQ_GOV_STOP: > >> >> + userspace_exit(devfreq); > >> >> + break; > >> >> + default: > >> >> + break; > >> >> + } > >> >> + > >> >> + return ret; > >> >> +} > >> >> + > >> >> const struct devfreq_governor devfreq_userspace = { > >> >> .name = "userspace", > >> >> .get_target_freq = devfreq_userspace_func, > >> >> - .init = userspace_init, > >> >> - .exit = userspace_exit, > >> >> - .no_central_polling = true, > >> >> + .event_handler = devfreq_userspace_handler, > >> >> }; > >> >> diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h > >> >> index 281c72a..7a11c3e 100644 > >> >> --- a/include/linux/devfreq.h > >> >> +++ b/include/linux/devfreq.h > >> >> @@ -91,25 +91,17 @@ struct devfreq_dev_profile { > >> >> * status of the device (load = busy_time / total_time). > >> >> * If no_central_polling is set, this callback is called > >> >> * only with update_devfreq() notified by OPP. > >> >> - * @init Called when the devfreq is being attached to a device > >> >> - * @exit Called when the devfreq is being removed from a > >> >> - * device. Governor should stop any internal routines > >> >> - * before return because related data may be > >> >> - * freed after exit(). > >> >> - * @no_central_polling Do not use devfreq's central polling mechanism. > >> >> - * When this is set, devfreq will not call > >> >> - * get_target_freq with devfreq_monitor(). However, > >> >> - * devfreq will call get_target_freq with > >> >> - * devfreq_update() notified by OPP framework. > >> >> + * @event_handler Callback for devfreq core framework to notify events > >> >> + * to governors. Events include per device governor > >> >> + * init and exit, opp changes out of devfreq, suspend > >> >> + * and resume of per device devfreq during device idle. > >> >> * > >> >> * Note that the callbacks are called with devfreq->lock locked by devfreq. > >> >> */ > >> >> struct devfreq_governor { > >> >> const char name[DEVFREQ_NAME_LEN]; > >> >> int (*get_target_freq)(struct devfreq *this, unsigned long *freq); > >> >> - int (*init)(struct devfreq *this); > >> >> - void (*exit)(struct devfreq *this); > >> >> - const bool no_central_polling; > >> >> + int (*event_handler)(struct devfreq *devfreq, unsigned int event); > >> >> }; > >> >> > >> >> /** > >> >> @@ -124,16 +116,10 @@ struct devfreq_governor { > >> >> * @nb notifier block used to notify devfreq object that it should > >> >> * reevaluate operable frequencies. Devfreq users may use > >> >> * devfreq.nb to the corresponding register notifier call chain. > >> >> - * @polling_jiffies interval in jiffies. > >> >> + * @work delayed work for load monitoring. > >> >> * @previous_freq previously configured frequency value. > >> >> - * @next_polling the number of remaining jiffies to poll with > >> >> - * "devfreq_monitor" executions to reevaluate > >> >> - * frequency/voltage of the device. Set by > >> >> - * profile's polling_ms interval. > >> >> * @data Private data of the governor. The devfreq framework does not > >> >> * touch this. > >> >> - * @being_removed a flag to mark that this object is being removed in > >> >> - * order to prevent trying to remove the object multiple times. > >> >> * @min_freq Limit minimum frequency requested by user (0: none) > >> >> * @max_freq Limit maximum frequency requested by user (0: none) > >> >> * > >> >> @@ -153,15 +139,12 @@ struct devfreq { > >> >> struct devfreq_dev_profile *profile; > >> >> const struct devfreq_governor *governor; > >> >> struct notifier_block nb; > >> >> + struct delayed_work work; > >> >> > >> >> - unsigned long polling_jiffies; > >> >> unsigned long previous_freq; > >> >> - unsigned int next_polling; > >> >> > >> >> void *data; /* private data for governors */ > >> >> > >> >> - bool being_removed; > >> >> - > >> >> unsigned long min_freq; > >> >> unsigned long max_freq; > >> >> }; > >> >> -- > >> >> 1.7.11.3 > >> >> > >> >> > >> >> > >> >> > >> >> > >> >> > >> >> > >> >> > >> > >> > >> > >> -- > >> Regards, > >> Rajagopal > >> > >> > >> > >> > >> > >> > >> > > > > -- > Regards, > Rajagopal > > > > > > -- > > MyungJoo Ham (함명주), PHD > > System S/W Lab, S/W Platform Team, Software Center > Samsung Electronics > Cell: +82-10-6714-2858 > > > > >

11 years, 8 months

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev September 2012