linaro-dev November 2012

linaro-dev@lists.linaro.org

70 participants
66 discussions

[PATCH V2 resend] net: dsa/slave: Fix compilation warnings

by Viresh Kumar

Currently when none of CONFIG_NET_DSA_TAG_DSA, CONFIG_NET_DSA_TAG_EDSA and CONFIG_NET_DSA_TAG_TRAILER is defined, we get following compilation warnings: net/dsa/slave.c:51:12: warning: 'dsa_slave_init' defined but not used [-Wunused-function] net/dsa/slave.c:60:12: warning: 'dsa_slave_open' defined but not used [-Wunused-function] net/dsa/slave.c:98:12: warning: 'dsa_slave_close' defined but not used [-Wunused-function] net/dsa/slave.c:116:13: warning: 'dsa_slave_change_rx_flags' defined but not used [-Wunused-function] net/dsa/slave.c:127:13: warning: 'dsa_slave_set_rx_mode' defined but not used [-Wunused-function] net/dsa/slave.c:136:12: warning: 'dsa_slave_set_mac_address' defined but not used [-Wunused-function] net/dsa/slave.c:164:12: warning: 'dsa_slave_ioctl' defined but not used [-Wunused-function] Earlier approach to fix this was discussed here: lkml.org/lkml/2012/10/29/549 This is another approach to fix it. This is done by some changes in config options, which make more sense than the earlier approach. As, atleast one tagging option must always be selected for using net/dsa/ infrastructure, this patch selects NET_DSA from tagging configs instead of having it as an selectable config. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- I am resending it as the earlier thread is lost somewhere in Maintainers mailbox :) drivers/net/dsa/Kconfig | 1 - net/dsa/Kconfig | 16 +++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig index dd151d5..96eae22 100644 --- a/drivers/net/dsa/Kconfig +++ b/drivers/net/dsa/Kconfig @@ -1,5 +1,4 @@ menu "Distributed Switch Architecture drivers" - depends on NET_DSA config NET_DSA_MV88E6XXX tristate diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index 9c09f6e..3588e54 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig @@ -1,5 +1,5 @@ config NET_DSA - tristate "Distributed Switch Architecture support" + tristate default n depends on NETDEVICES && !S390 select PHYLIB @@ -8,19 +8,21 @@ config NET_DSA the Distributed Switch Architecture. -if NET_DSA +menu "Distributed Switch Architecture support" # tagging formats config NET_DSA_TAG_DSA - bool + bool "Original DSA packet tagging format" + select NET_DSA default n config NET_DSA_TAG_EDSA - bool + bool "Ethertype DSA packet tagging format" + select NET_DSA default n config NET_DSA_TAG_TRAILER - bool + bool "Trailer DSA packet tagging format" + select NET_DSA default n - -endif +endmenu -- 1.7.12.rc2.18.g61b472e

11 years, 5 months

big.LITTLE MP status week of Nov 19, 2012

by David Zinman

https://wiki.linaro.org/projects/big.LITTLE.MP big.LITTLE MP v12 has been built: http://lists.linaro.org/pipermail/linaro-dev/2012-November/014490.html Roadmap Cards ============== http://cards.linaro.org/browse/CARD-190 No change from last status QA ====== The paperwork for the TC2 board that has been stuck in customs in India and it's release is hopefully imminent. This also coincides with some cleared blockages for the QA team and the hardware coming on line in the lab. This means our QA efforts can proceed much more efficiently. Other efforts ============ On big.LITTLE MP kernel branch Vincent has finally found and patched the root cause of a bug in the scheduler that generates spurious wake up of idle CPU. He has spent some time to discuss the fix for the inclusion of packing small tasks patches in the master branch, and is preparing the next version of packing small tasks but i would like to come with figures for real use case like mp3. Mathieu is concentrating on benchmarking: being able to run same benchmark with IKS MP and a15 to start comparing things. -- David Zinman, Project Manager Linaro.org | Open source software for ARM SoCs -- David Zinman, Project Manager Linaro.org | Open source software for ARM SoCs

11 years, 5 months

[PATCH 1/2] cpufreq: return early from __cpufreq_driver_getavg()

by Viresh Kumar

There is no need to do cpufreq_get_cpu() and cpufreq_put_cpu() for drivers that don't support getavg() routine. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- drivers/cpufreq/cpufreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 85df538..f552d5f 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1511,12 +1511,14 @@ int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu) { int ret = 0; + if (!(cpu_online(cpu) && cpufreq_driver->getavg)) + return 0; + policy = cpufreq_cpu_get(policy->cpu); if (!policy) return -EINVAL; - if (cpu_online(cpu) && cpufreq_driver->getavg) - ret = cpufreq_driver->getavg(policy, cpu); + ret = cpufreq_driver->getavg(policy, cpu); cpufreq_cpu_put(policy); return ret; -- 1.7.12.rc2.18.g61b472e

11 years, 5 months

[PM-QA PATCH 1/3] thermal: bug fix of check_valid_temp function

by hongbo.zhang

From: "hongbo.zhang" <hongbo.zhang(a)linaro.com> the greater-than symbol ">" in if state isn't valid and a file named "0" will be created in this case, "-gt" should be used instead. Signed-off-by: hongbo.zhang <hongbo.zhang(a)linaro.com> --- include/thermal_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/thermal_functions.sh b/include/thermal_functions.sh index 5b60698..f385ec1 100644 --- a/include/thermal_functions.sh +++ b/include/thermal_functions.sh @@ -42,7 +42,7 @@ check_valid_temp() { local descr="'$zone_name'/'$file' ='$temp_val'" log_begin "checking $descr" - if [ $temp_val > 0 ]; then + if [ $temp_val -gt 0 ]; then log_end "pass" return 0 fi -- 1.8.0

11 years, 5 months

[PATCH] mfd: ab8500: add static linkage for battery info

by Rajanikanth H.V

From: "Rajanikanth H.V" <rajanikanth.hv(a)linaro.org> enforce static linkage for battery attributes structures this patch is against: "mfd-ab8500-add-devicetree-support-for-fuelgauge" Signed-off-by: Rajanikanth H.V <rajanikanth.hv(a)linaro.org> --- drivers/power/ab8500_bmdata.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/power/ab8500_bmdata.c b/drivers/power/ab8500_bmdata.c index ff8f055..db17930 100644 --- a/drivers/power/ab8500_bmdata.c +++ b/drivers/power/ab8500_bmdata.c @@ -143,7 +143,7 @@ static struct abx500_res_to_temp temp_tbl[] = { * Note that the batres_vs_temp table must be strictly sorted by falling * temperature values to work. */ -struct batres_vs_temp temp_to_batres_tbl_thermistor[] = { +static struct batres_vs_temp temp_to_batres_tbl_thermistor[] = { { 40, 120}, { 30, 135}, { 20, 165}, @@ -157,7 +157,7 @@ struct batres_vs_temp temp_to_batres_tbl_thermistor[] = { * Note that the batres_vs_temp table must be strictly sorted by falling * temperature values to work. */ -struct batres_vs_temp temp_to_batres_tbl_ext_thermistor[] = { +static struct batres_vs_temp temp_to_batres_tbl_ext_thermistor[] = { { 60, 300}, { 30, 300}, { 20, 300}, @@ -168,7 +168,7 @@ struct batres_vs_temp temp_to_batres_tbl_ext_thermistor[] = { }; /* battery resistance table for LI ION 9100 battery */ -struct batres_vs_temp temp_to_batres_tbl_9100[] = { +static struct batres_vs_temp temp_to_batres_tbl_9100[] = { { 60, 180}, { 30, 180}, { 20, 180}, -- 1.7.10.4

11 years, 5 months

[PATCH 0/4] Implement device tree support for ab8500 BM Devices

by Rajanikanth H.V

From: "Rajanikanth H.V" <rajanikanth.hv(a)linaro.org> This patch-set adds device tree binding for ab8500 battery-managed devices. Removes the redundant platform structure maintained across bm devices and implements common DT probe routine across all the modules. Test status: a) Tested across 'legacy platform data' and DT binding support a.1) ab8500_charger driver fails to get regulator in the legacy platform mode. b) Interrupt numbers assigned differs between legacy and FDT mode. (a) Legacy platform_data Mode: root@ME:/ cat /proc/interrupts CPU0 CPU1 483: 0 0 ab8500 ab8500-ponkey-dbf 484: 0 0 ab8500 ab8500-ponkey-dbr 485: 0 0 ab8500 BATT_OVV 494: 0 1 ab8500 495: 0 0 ab8500 ab8500-rtc 501: 0 13 ab8500 NCONV_ACCU 503: 7 22 ab8500 CCEOC 504: 0 1 ab8500 CC_INT_CALIB 505: 0 0 ab8500 LOW_BAT_F 516: 0 34 ab8500 ab8500-gpadc 556: 0 0 ab8500 usb-link-status (b) FDT Mode: root@ME:/ cat /proc/interrupts CPU0 CPU1 6: 0 0 ab8500 ab8500-ponkey-dbf 7: 0 0 ab8500 ab8500-ponkey-dbr 8: 0 0 ab8500 BATT_OVV 162: 0 7 ab8500 ab8500-gpadc 163: 0 1 ab8500 164: 0 0 ab8500 ab8500-rtc 484: 0 0 ab8500 usb-link-status 499: 0 4 ab8500 NCONV_ACCU 500: 0 0 ab8500 LOW_BAT_F 502: 0 1 ab8500 CC_INT_CALIB 503: 0 6 ab8500 CCEOC c) Event handlers across bm-modules have been verified only during 'battery discharge process' as 'battery charging process' depends on ab8500-usb code d) observed nested IRQ issue, log below: root@ME:/ ------------[ cut here ]------------ WARNING: at /home/rhv00000/linaro_work/linux/kernel/irq/manage.c:635 irq_nested_primary_handler+0x20/0x28() Primary handler called for nested irq 193 Modules linked in: [<c0014884>] (unwind_backtrace+0x0/0xf8) from [<c001cbb4>] (warn_slowpath_common+0x4c/0x64) [<c001cbb4>] (warn_slowpath_common+0x4c/0x64) from [<c001cc60>] (warn_slowpath_fmt+0x30/0x40) [<c001cc60>] (warn_slowpath_fmt+0x30/0x40) from [<c0060f00>] (irq_nested_primary_handler+0x20/0x28) [<c0060f00>] (irq_nested_primary_handler+0x20/0x28) from [<c0060b80>] (handle_irq_event_percpu+0x50/0x194) [<c0060b80>] (handle_irq_event_percpu+0x50/0x194) from [<c0060d00>] (handle_irq_event+0x3c/0x5c) [<c0060d00>] (handle_irq_event+0x3c/0x5c) from [<c0063034>] (handle_simple_irq+0x8c/0xc4) [<c0063034>] (handle_simple_irq+0x8c/0xc4) from [<c0062d84>] (resend_irqs+0x40/0x68) [<c0062d84>] (resend_irqs+0x40/0x68) from [<c00236d8>] (tasklet_action+0x84/0x120) [<c00236d8>] (tasklet_action+0x84/0x120) from [<c0023ae4>] (__do_softirq+0xd8/0x198) [<c0023ae4>] (__do_softirq+0xd8/0x198) from [<c0023ed4>] (irq_exit+0x90/0x98) [<c0023ed4>] (irq_exit+0x90/0x98) from [<c000f2cc>] (handle_IRQ+0x50/0xb0) [<c000f2cc>] (handle_IRQ+0x50/0xb0) from [<c00084f0>] (gic_handle_irq+0x28/0x5c) [<c00084f0>] (gic_handle_irq+0x28/0x5c) from [<c000df80>] (__irq_svc+0x40/0x70) Exception stack(0xebc5dea8 to 0xebc5def0) dea0: c0f45340 ebc4cf00 00000000 1f321f32 eb196600 ebc4cf00 dec0: c05a3340 00000002 ebc4c600 00000000 eb1b2c00 ebc5df0c 00000000 ebc5def0 dee0: c0040c7c c02ca5ec 60000013 ffffffff [<c000df80>] (__irq_svc+0x40/0x70) from [<c02ca5ec>] (_raw_spin_unlock_irq+0x28/0x50) [<c02ca5ec>] (_raw_spin_unlock_irq+0x28/0x50) from [<c0040c7c>] (finish_task_switch+0x28/0xf0) [<c0040c7c>] (finish_task_switch+0x28/0xf0) from [<c02c93f0>] (__schedule+0x254/0x548) [<c02c93f0>] (__schedule+0x254/0x548) from [<c0040088>] (smpboot_thread_fn+0x11c/0x250) [<c0040088>] (smpboot_thread_fn+0x11c/0x250) from [<c0037fc8>] (kthread+0xa4/0xb0) [<c0037fc8>] (kthread+0xa4/0xb0) from [<c000e418>] (ret_from_fork+0x14/0x3c) ---[ end trace 1b75b31a2719ed1e ]--- Rajanikanth H.V (4): mfd: ab8500: add devicetree support for fuelgauge mfd: ab8500: add devicetree support for btemp mfd: ab8500: add devicetree support for charger mfd: ab8500: add devicetree support for chargalg Documentation/devicetree/bindings/mfd/ab8500.txt | 27 +- .../bindings/power_supply/ab8500/btemp.txt | 16 + .../bindings/power_supply/ab8500/chargalg.txt | 16 + .../bindings/power_supply/ab8500/charger.txt | 25 + .../devicetree/bindings/power_supply/ab8500/fg.txt | 58 +++ arch/arm/boot/dts/dbx5x0.dtsi | 26 + drivers/mfd/ab8500-core.c | 20 + drivers/power/Kconfig | 6 - drivers/power/Makefile | 2 +- drivers/power/ab8500_bmdata.c | 514 ++++++++++++++++++++ drivers/power/ab8500_btemp.c | 75 +-- drivers/power/ab8500_charger.c | 83 ++-- drivers/power/ab8500_fg.c | 81 +-- drivers/power/abx500_chargalg.c | 57 ++- include/linux/mfd/abx500.h | 34 +- 15 files changed, 879 insertions(+), 161 deletions(-) create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/charger.txt create mode 100644 Documentation/devicetree/bindings/power_supply/ab8500/fg.txt create mode 100644 drivers/power/ab8500_bmdata.c -- 1.7.10.4

11 years, 5 months

Exynos5 binary blobs situation on devices running GNU/Linux

by Marcin Juszkiewicz

Hello everybody This time I want to post some information and questions about binary blobs situation on Exynos5 devices. It means Samsung Chromebook and Andale Board (I do not have data about other Exynos5 powered devices). Chromebook ships with Chromium OS and under it has working OpenGL ES and OpenMAX based video acceleration. I was able to play 1080p YouTube videos both on internal and external screen without any slowdown. But under normal GNU/Linux systems (Debian, Fedora, OpenSUSE, Ubuntu) there is none of it... We got OpenGL ES running by copying libmali and all symlinks pointing to it (lib{EGL,GLES} etc) and taking care of /dev/mali* permissions. But we can not make packages with it for our distibutions because of lack of any license for it. Normal "this is proprietary binary, do not hack it etc but you can distribute it freely" kind of license will be enough. Android binaries for OpenGL ES are available for Andale Board. GNU/Linux ones can be extracted from Chromebook recovery image (363MB download extracting to ~1GB file). But lack of license anyway. I know that we have ARM Ltd. people here, same with Samsung - maybe someone can tell us what is going on in this area? Other thing is video acceleration. I do not know is there a source for it available or not. This is area where I do not have knowledge needed to get it running. All I know is that Exynos5 itself is able to play 480p DivX encoded movie - did not yet tried 720p or 1080p ones but do not think it will make it on it own.

11 years, 5 months

[PATCH] flashbench: Fix --find-fat long_option

by Andrew Bradford

Fix --find-fat long_option name so that it's consistent with the print_help() output. Signed-off-by: Andrew Bradford <andrew(a)bradfordembedded.com> --- flashbench.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flashbench.c b/flashbench.c index 5fffe63..22917a1 100644 --- a/flashbench.c +++ b/flashbench.c @@ -628,7 +628,7 @@ static int parse_arguments(int argc, char **argv, struct arguments *args) { "align", 0, NULL, 'a' }, { "interval", 0, NULL, 'i' }, { "interval-order", 1, NULL, 'I' }, - { "findfat", 0, NULL, 'f' }, + { "find-fat", 0, NULL, 'f' }, { "fat-nr", 1, NULL, 'F' }, { "open-au", 0, NULL, 'O' }, { "open-au-nr", 1, NULL, '0' }, -- 1.7.10.4

11 years, 5 months

Fwd: Re: Fwd: trouble using wifi on Linaro Ubuntu for Pandaboard

by Andy Green

-------- Original Message -------- Subject: Re: Fwd: trouble using wifi on Linaro Ubuntu for Pandaboard Date: Sun, 18 Nov 2012 22:13:57 -0800 (PST) From: Alex Stefanescu <stefanescu(a)rice.edu> Reply-To: Alex Stefanescu <stefanescu(a)rice.edu> To: Andy Green <andy.green(a)linaro.org> Thank you for the reply. It worked! -- Alex Stef ------------------------------------------------------------------------ *From:* Andy Green <andy.green(a)linaro.org> *To:* Fathi Boudra <fathi.boudra(a)linaro.org> *Cc:* Alex Stefanescu <stefanescu(a)rice.edu>; linaro-dev <linaro-dev(a)lists.linaro.org> *Sent:* Sunday, November 18, 2012 9:21 PM *Subject:* Re: Fwd: trouble using wifi on Linaro Ubuntu for Pandaboard On 11/18/12 16:24, the mail apparently from Fathi Boudra included: > Wrong mailing list, forwarding lo linaro-dev > > ---------- Forwarded message ---------- > From: Alex Stefanescu <stefanescu(a)rice.edu <mailto:stefanescu@rice.edu>> > Date: 18 November 2012 02:09 > Subject: trouble using wifi on Linaro Ubuntu for Pandaboard > > Hello, > > I'm having trouble connecting to wifi on the Linaro Ubuntu releases > for the Pandaboard. I've tried with both 12.10 and 12.09 releases, > which are listed to have passed the wifi test. ... > I'm using Pandaboard with OMAP4430 and wl1271 wlan chipset. > > I've also tried running wpa_supplicant manually to connect to both the > same open network, or another one secured with WPA2 (I used the > wpa_supplicant.conf from an Android phone so I'm pretty sure it was > correct) and I have the same issue. There is also a wpa_supplicant > always running in the background, does it matter? Yes you can't have two wpa_supplicants fighting over the state of the same wireless interface. The "by hand" method for the WPA2 network --> # service network-manager stop # wpa_passphrase "Rice Visitor" > /etc/wpa_supplicant/wpa_supplicant.conf (type the AP passphrase and enter) # wpa_supplicant -Dwext -iwlan0 -c /etc/wpa_supplicant/wpa_supplicant.conf & (should associate after a second or two) # dhclient wlan0 At that point you should have an IP on wlan0, default route and DNS configured and workable. For unencrypted AP "by hand", you don't use wpa_supplicant. # service network-manager stop # killall wpa_supplicant # iwlist wlan0 scan (find your AP, use its info below) # ifconfig wlan0 up # iwconfig wlan0 essid "Unencypted AP Name" # iwconfig wlan0 chan 11 # iwconfig wlan0 ap 00:1F:12:34:56:78 (check if associated) # iwconfig wlan0 IEEE 802.11abgn ESSID:"Unencrypted AP Name" Mode:Managed Frequency:2.462 GHz Access Point: 00:1F:12:34:56:78 Bit Rate=72.2 Mb/s Tx-Power=20 dBm Retry long limit:7 RTS thr:off Fragment thr:off Encryption key:off Power Management:on Link Quality=40/70 Signal level=-70 dBm Rx invalid nwid:0 Rx invalid crypt:0 Rx invalid frag:0 Tx excessive retries:0 Invalid misc:2 Missed beacon:0 # dhclient wlan0 Again your connection should have DNS, route and be workable. If you're missing some of these commands make sure you have dhcp3-client and wireless-tools packages. -Andy -- Andy Green | TI Landing Team Leader Linaro.org │ Open source software for ARM SoCs | Follow Linaro http://facebook.com/pages/Linaro/155974581091106 - http://twitter.com/#!/linaroorg - http://linaro.org/linaro-blog

11 years, 5 months

[RFC PATCH] PM / devfreq: Add runtime-pm support

by Rajagopal Venkat

Instead of devfreq device driver explicitly calling devfreq suspend and resume apis perhaps from runtime-pm suspend and resume callbacks, let devfreq core handle it automatically. Attach devfreq core to runtime-pm framework so that, devfreq device driver pm_runtime_suspend() will automatically suspend the devfreq and pm_runtime_resume() will resume the devfreq. Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> --- drivers/devfreq/devfreq.c | 145 ++++++++++++++++++++++++++++++++-------------- include/linux/devfreq.h | 12 ---- 2 files changed, 102 insertions(+), 55 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 45e053e..190e414 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -25,10 +25,9 @@ #include <linux/list.h> #include <linux/printk.h> #include <linux/hrtimer.h> +#include <linux/pm_runtime.h> #include "governor.h" -static struct class *devfreq_class; - /* * devfreq core provides delayed work based load monitoring helper * functions. Governors can use these or can implement their own @@ -414,6 +413,93 @@ static void devfreq_dev_release(struct device *dev) } /** + * devfreq_suspend_device() - Suspend devfreq of a device. + * @devfreq: the devfreq instance to be suspended + */ +static int devfreq_suspend_device(struct devfreq *devfreq) +{ + if (!devfreq) + return -EINVAL; + + if (!devfreq->governor) + return 0; + + return devfreq->governor->event_handler(devfreq, + DEVFREQ_GOV_SUSPEND, NULL); +} + +/** + * devfreq_resume_device() - Resume devfreq of a device. + * @devfreq: the devfreq instance to be resumed + */ +static int devfreq_resume_device(struct devfreq *devfreq) +{ + if (!devfreq) + return -EINVAL; + + if (!devfreq->governor) + return 0; + + return devfreq->governor->event_handler(devfreq, + DEVFREQ_GOV_RESUME, NULL); +} + +static int devfreq_runtime_suspend(struct device *dev) +{ + int ret; + struct devfreq *devfreq; + + mutex_lock(&devfreq_list_lock); + devfreq = find_device_devfreq(dev); + mutex_unlock(&devfreq_list_lock); + + ret = devfreq_suspend_device(devfreq); + if (ret < 0) + goto out; + + ret = pm_generic_runtime_suspend(dev); +out: + return ret; +} + +static int devfreq_runtime_resume(struct device *dev) +{ + int ret; + struct devfreq *devfreq; + + mutex_lock(&devfreq_list_lock); + devfreq = find_device_devfreq(dev); + mutex_unlock(&devfreq_list_lock); + + ret = devfreq_resume_device(devfreq); + if (ret < 0) + goto out; + + ret = pm_generic_runtime_resume(dev); +out: + return ret; +} + +static int devfreq_runtime_idle(struct device *dev) +{ + return pm_generic_runtime_idle(dev); +} + +static const struct dev_pm_ops devfreq_pm_ops = { + SET_RUNTIME_PM_OPS( + devfreq_runtime_suspend, + devfreq_runtime_resume, + devfreq_runtime_idle + ) +}; + +static struct class devfreq_class = { + .name = "devfreq", + .owner = THIS_MODULE, + .pm = &devfreq_pm_ops, +}; + +/** * devfreq_add_device() - Add devfreq feature to the device * @dev: the device to add devfreq feature. * @profile: device-specific profile to run devfreq. @@ -454,8 +540,9 @@ struct devfreq *devfreq_add_device(struct device *dev, mutex_init(&devfreq->lock); mutex_lock(&devfreq->lock); + dev->class = &devfreq_class; devfreq->dev.parent = dev; - devfreq->dev.class = devfreq_class; + devfreq->dev.class = &devfreq_class; devfreq->dev.release = devfreq_dev_release; devfreq->profile = profile; strncpy(devfreq->governor_name, governor_name, DEVFREQ_NAME_LEN); @@ -498,6 +585,9 @@ struct devfreq *devfreq_add_device(struct device *dev, goto err_init; } + pm_runtime_get_noresume(dev); + pm_runtime_set_active(dev); + return devfreq; err_init: @@ -526,40 +616,6 @@ int devfreq_remove_device(struct devfreq *devfreq) EXPORT_SYMBOL(devfreq_remove_device); /** - * devfreq_suspend_device() - Suspend devfreq of a device. - * @devfreq: the devfreq instance to be suspended - */ -int devfreq_suspend_device(struct devfreq *devfreq) -{ - if (!devfreq) - return -EINVAL; - - if (!devfreq->governor) - return 0; - - return devfreq->governor->event_handler(devfreq, - DEVFREQ_GOV_SUSPEND, NULL); -} -EXPORT_SYMBOL(devfreq_suspend_device); - -/** - * devfreq_resume_device() - Resume devfreq of a device. - * @devfreq: the devfreq instance to be resumed - */ -int devfreq_resume_device(struct devfreq *devfreq) -{ - if (!devfreq) - return -EINVAL; - - if (!devfreq->governor) - return 0; - - return devfreq->governor->event_handler(devfreq, - DEVFREQ_GOV_RESUME, NULL); -} -EXPORT_SYMBOL(devfreq_resume_device); - -/** * devfreq_add_governor() - Add devfreq governor * @governor: the devfreq governor to be added */ @@ -730,6 +786,7 @@ out: ret = count; return ret; } + static ssize_t show_available_governors(struct device *d, struct device_attribute *attr, char *buf) @@ -952,19 +1009,21 @@ static struct device_attribute devfreq_attrs[] = { static int __init devfreq_init(void) { - devfreq_class = class_create(THIS_MODULE, "devfreq"); - if (IS_ERR(devfreq_class)) { + int err; + + err = class_register(&devfreq_class); + if (err < 0) { pr_err("%s: couldn't create class\n", __FILE__); - return PTR_ERR(devfreq_class); + return err; } devfreq_wq = create_freezable_workqueue("devfreq_wq"); if (IS_ERR(devfreq_wq)) { - class_destroy(devfreq_class); + class_unregister(&devfreq_class); pr_err("%s: couldn't create workqueue\n", __FILE__); return PTR_ERR(devfreq_wq); } - devfreq_class->dev_attrs = devfreq_attrs; + devfreq_class.dev_attrs = devfreq_attrs; return 0; } @@ -972,7 +1031,7 @@ subsys_initcall(devfreq_init); static void __exit devfreq_exit(void) { - class_destroy(devfreq_class); + class_unregister(&devfreq_class); destroy_workqueue(devfreq_wq); } module_exit(devfreq_exit); diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index 235248c..4fd920f 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -181,8 +181,6 @@ extern struct devfreq *devfreq_add_device(struct device *dev, const char *governor_name, void *data); extern int devfreq_remove_device(struct devfreq *devfreq); -extern int devfreq_suspend_device(struct devfreq *devfreq); -extern int devfreq_resume_device(struct devfreq *devfreq); /* Helper functions for devfreq user device driver with OPP. */ extern struct opp *devfreq_recommended_opp(struct device *dev, @@ -226,16 +224,6 @@ static int devfreq_remove_device(struct devfreq *devfreq) return 0; } -static int devfreq_suspend_device(struct devfreq *devfreq) -{ - return 0; -} - -static int devfreq_resume_device(struct devfreq *devfreq) -{ - return 0; -} - static struct opp *devfreq_recommended_opp(struct device *dev, unsigned long *freq, u32 flags) { -- 1.7.11.3

11 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev November 2012