On Thu, Aug 11, 2011 at 05:06:38PM +0200, jean.pihet@xxxxxxxxxxxxxx wrote:
> From: Jean Pihet <j-pihet@xxxxxx>
>
> The PM QoS implementation files are better named
> kernel/power/qos.c and include/linux/pm_qos.h.
>
> The PM QoS support is compiled under the CONFIG_PM option.
>
> Signed-off-by: Jean Pihet <j-pihet@xxxxxx>
> ---
> arch/arm/mach-msm/clock.c | 2 +-
> drivers/acpi/processor_idle.c | 2 +-
> drivers/cpuidle/cpuidle.c | 2 +-
> drivers/cpuidle/governors/ladder.c | 2 +-
> drivers/cpuidle/governors/menu.c | 2 +-
> drivers/media/video/via-camera.c | 2 +-
> drivers/net/e1000e/netdev.c | 2 +-
> drivers/net/wireless/ipw2x00/ipw2100.c | 2 +-
> drivers/staging/msm/lcdc.c | 2 +-
> drivers/staging/msm/tvenc.c | 2 +-
> include/linux/netdevice.h | 2 +-
> include/linux/pm_qos.h | 61 ++++
> include/linux/pm_qos_params.h | 38 ---
> include/sound/pcm.h | 2 +-
> kernel/Makefile | 2 +-
> kernel/pm_qos_params.c | 481 --------------------------------
> kernel/power/Makefile | 2 +-
> kernel/power/qos.c | 481 ++++++++++++++++++++++++++++++++
> net/mac80211/main.c | 2 +-
> net/mac80211/mlme.c | 2 +-
> net/mac80211/scan.c | 2 +-
> sound/core/pcm_native.c | 2 +-
> 22 files changed, 560 insertions(+), 537 deletions(-)
> create mode 100644 include/linux/pm_qos.h
> delete mode 100644 include/linux/pm_qos_params.h
> delete mode 100644 kernel/pm_qos_params.c
> create mode 100644 kernel/power/qos.c
>
> diff --git a/arch/arm/mach-msm/clock.c b/arch/arm/mach-msm/clock.c
> index 22a5376..d9145df 100644
> --- a/arch/arm/mach-msm/clock.c
> +++ b/arch/arm/mach-msm/clock.c
> @@ -18,7 +18,7 @@
> #include <linux/list.h>
> #include <linux/err.h>
> #include <linux/spinlock.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/mutex.h>
> #include <linux/clk.h>
> #include <linux/string.h>
> diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
> index 431ab11..2e69e09 100644
> --- a/drivers/acpi/processor_idle.c
> +++ b/drivers/acpi/processor_idle.c
> @@ -37,7 +37,7 @@
> #include <linux/dmi.h>
> #include <linux/moduleparam.h>
> #include <linux/sched.h> /* need_resched() */
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/clockchips.h>
> #include <linux/cpuidle.h>
> #include <linux/irqflags.h>
> diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
> index bf50924..eed4c47 100644
> --- a/drivers/cpuidle/cpuidle.c
> +++ b/drivers/cpuidle/cpuidle.c
> @@ -12,7 +12,7 @@
> #include <linux/mutex.h>
> #include <linux/sched.h>
> #include <linux/notifier.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/cpu.h>
> #include <linux/cpuidle.h>
> #include <linux/ktime.h>
> diff --git a/drivers/cpuidle/governors/ladder.c b/drivers/cpuidle/governors/ladder.c
> index 12c9890..f62fde2 100644
> --- a/drivers/cpuidle/governors/ladder.c
> +++ b/drivers/cpuidle/governors/ladder.c
> @@ -14,7 +14,7 @@
>
> #include <linux/kernel.h>
> #include <linux/cpuidle.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/moduleparam.h>
> #include <linux/jiffies.h>
>
> diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
> index c47f3d0..3600f19 100644
> --- a/drivers/cpuidle/governors/menu.c
> +++ b/drivers/cpuidle/governors/menu.c
> @@ -12,7 +12,7 @@
>
> #include <linux/kernel.h>
> #include <linux/cpuidle.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/time.h>
> #include <linux/ktime.h>
> #include <linux/hrtimer.h>
> diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c
> index 85d3048..b3ca389 100644
> --- a/drivers/media/video/via-camera.c
> +++ b/drivers/media/video/via-camera.c
> @@ -21,7 +21,7 @@
> #include <media/videobuf-dma-sg.h>
> #include <linux/delay.h>
> #include <linux/dma-mapping.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/via-core.h>
> #include <linux/via-gpio.h>
> #include <linux/via_i2c.h>
> diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
> index 3310c3d..a8a18e1 100644
> --- a/drivers/net/e1000e/netdev.c
> +++ b/drivers/net/e1000e/netdev.c
> @@ -46,7 +46,7 @@
> #include <linux/if_vlan.h>
> #include <linux/cpu.h>
> #include <linux/smp.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/pm_runtime.h>
> #include <linux/aer.h>
> #include <linux/prefetch.h>
> diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
> index 4430775..d9df575 100644
> --- a/drivers/net/wireless/ipw2x00/ipw2100.c
> +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
> @@ -161,7 +161,7 @@ that only one external action is invoked at a time.
> #include <linux/firmware.h>
> #include <linux/acpi.h>
> #include <linux/ctype.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
>
> #include <net/lib80211.h>
>
> diff --git a/drivers/staging/msm/lcdc.c b/drivers/staging/msm/lcdc.c
> index 8183394..1d5183d 100644
> --- a/drivers/staging/msm/lcdc.c
> +++ b/drivers/staging/msm/lcdc.c
> @@ -32,7 +32,7 @@
> #include <linux/uaccess.h>
> #include <linux/clk.h>
> #include <linux/platform_device.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
>
> #include "msm_fb.h"
>
> diff --git a/drivers/staging/msm/tvenc.c b/drivers/staging/msm/tvenc.c
> index 4fbb77b..5a798b8 100644
> --- a/drivers/staging/msm/tvenc.c
> +++ b/drivers/staging/msm/tvenc.c
> @@ -32,7 +32,7 @@
> #include <linux/uaccess.h>
> #include <linux/clk.h>
> #include <linux/platform_device.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
>
> #define TVENC_C
> #include "tvenc.h"
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 54b8b4d..cc1eb9e 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -31,7 +31,7 @@
> #include <linux/if_link.h>
>
> #ifdef __KERNEL__
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/timer.h>
> #include <linux/delay.h>
> #include <linux/mm.h>
> diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
> new file mode 100644
> index 0000000..7ba67541
> --- /dev/null
> +++ b/include/linux/pm_qos.h
> @@ -0,0 +1,61 @@
> +#ifndef _LINUX_PM_QOS_H
> +#define _LINUX_PM_QOS_H
> +/* interface for the pm_qos_power infrastructure of the linux kernel.
> + *
> + * Mark Gross <mgross@xxxxxxxxxxxxxxx>
> + */
> +#include <linux/plist.h>
> +#include <linux/notifier.h>
> +#include <linux/miscdevice.h>
> +
> +#define PM_QOS_RESERVED 0
> +#define PM_QOS_CPU_DMA_LATENCY 1
> +#define PM_QOS_NETWORK_LATENCY 2
> +#define PM_QOS_NETWORK_THROUGHPUT 3
> +
> +#define PM_QOS_NUM_CLASSES 4
> +#define PM_QOS_DEFAULT_VALUE -1
> +
> +#define PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC)
> +#define PM_QOS_NETWORK_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC)
> +#define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE 0
> +
> +struct pm_qos_request_list {
> + struct plist_node list;
> + int pm_qos_class;
> +};
> +
> +#ifdef CONFIG_PM
> +void pm_qos_add_request(struct pm_qos_request_list *l,
> + int pm_qos_class, s32 value);
> +void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,
> + s32 new_value);
> +void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req);
> +
> +int pm_qos_request(int pm_qos_class);
> +int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier);
> +int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier);
> +int pm_qos_request_active(struct pm_qos_request_list *req);
> +#else
> +static inline void pm_qos_add_request(struct pm_qos_request_list *l,
> + int pm_qos_class, s32 value)
> + { return; }
> +static inline void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,
> + s32 new_value)
> + { return; }
> +static inline void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req)
> + { return; }
> +
> +static inline int pm_qos_request(int pm_qos_class)
> + { return 0; }
> +static inline int pm_qos_add_notifier(int pm_qos_class,
> + struct notifier_block *notifier)
> + { return 0; }
> +static inline int pm_qos_remove_notifier(int pm_qos_class,
> + struct notifier_block *notifier)
> + { return 0; }
> +static inline int pm_qos_request_active(struct pm_qos_request_list *req)
> + { return 0; }
> +#endif
> +
> +#endif
> diff --git a/include/linux/pm_qos_params.h b/include/linux/pm_qos_params.h
> deleted file mode 100644
> index a7d87f9..0000000
> --- a/include/linux/pm_qos_params.h
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -#ifndef _LINUX_PM_QOS_PARAMS_H
> -#define _LINUX_PM_QOS_PARAMS_H
> -/* interface for the pm_qos_power infrastructure of the linux kernel.
> - *
> - * Mark Gross <mgross@xxxxxxxxxxxxxxx>
> - */
> -#include <linux/plist.h>
> -#include <linux/notifier.h>
> -#include <linux/miscdevice.h>
> -
> -#define PM_QOS_RESERVED 0
> -#define PM_QOS_CPU_DMA_LATENCY 1
> -#define PM_QOS_NETWORK_LATENCY 2
> -#define PM_QOS_NETWORK_THROUGHPUT 3
> -
> -#define PM_QOS_NUM_CLASSES 4
> -#define PM_QOS_DEFAULT_VALUE -1
> -
> -#define PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC)
> -#define PM_QOS_NETWORK_LAT_DEFAULT_VALUE (2000 * USEC_PER_SEC)
> -#define PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE 0
> -
> -struct pm_qos_request_list {
> - struct plist_node list;
> - int pm_qos_class;
> -};
> -
> -void pm_qos_add_request(struct pm_qos_request_list *l, int pm_qos_class, s32 value);
> -void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,
> - s32 new_value);
> -void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req);
> -
> -int pm_qos_request(int pm_qos_class);
> -int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier);
> -int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier);
> -int pm_qos_request_active(struct pm_qos_request_list *req);
> -
> -#endif
> diff --git a/include/sound/pcm.h b/include/sound/pcm.h
> index e1bad11..1204f17 100644
> --- a/include/sound/pcm.h
> +++ b/include/sound/pcm.h
> @@ -29,7 +29,7 @@
> #include <linux/poll.h>
> #include <linux/mm.h>
> #include <linux/bitops.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
>
> #define snd_pcm_substream_chip(substream) ((substream)->private_data)
> #define snd_pcm_chip(pcm) ((pcm)->private_data)
> diff --git a/kernel/Makefile b/kernel/Makefile
> index 2d64cfc..c4547c7 100644
> --- a/kernel/Makefile
> +++ b/kernel/Makefile
> @@ -9,7 +9,7 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \
> rcupdate.o extable.o params.o posix-timers.o \
> kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
> hrtimer.o rwsem.o nsproxy.o srcu.o semaphore.o \
> - notifier.o ksysfs.o pm_qos_params.o sched_clock.o cred.o \
> + notifier.o ksysfs.o sched_clock.o cred.o \
> async.o range.o jump_label.o
> obj-y += groups.o
>
> diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
> deleted file mode 100644
> index 6824ca7..0000000
> --- a/kernel/pm_qos_params.c
> +++ /dev/null
> @@ -1,481 +0,0 @@
> -/*
> - * This module exposes the interface to kernel space for specifying
> - * QoS dependencies. It provides infrastructure for registration of:
> - *
> - * Dependents on a QoS value : register requests
> - * Watchers of QoS value : get notified when target QoS value changes
> - *
> - * This QoS design is best effort based. Dependents register their QoS needs.
> - * Watchers register to keep track of the current QoS needs of the system.
> - *
> - * There are 3 basic classes of QoS parameter: latency, timeout, throughput
> - * each have defined units:
> - * latency: usec
> - * timeout: usec <-- currently not used.
> - * throughput: kbs (kilo byte / sec)
> - *
> - * There are lists of pm_qos_objects each one wrapping requests, notifiers
> - *
> - * User mode requests on a QOS parameter register themselves to the
> - * subsystem by opening the device node /dev/... and writing there request to
> - * the node. As long as the process holds a file handle open to the node the
> - * client continues to be accounted for. Upon file release the usermode
> - * request is removed and a new qos target is computed. This way when the
> - * request that the application has is cleaned up when closes the file
> - * pointer or exits the pm_qos_object will get an opportunity to clean up.
> - *
> - * Mark Gross <mgross@xxxxxxxxxxxxxxx>
> - */
> -
> -/*#define DEBUG*/
> -
> -#include <linux/pm_qos_params.h>
> -#include <linux/sched.h>
> -#include <linux/spinlock.h>
> -#include <linux/slab.h>
> -#include <linux/time.h>
> -#include <linux/fs.h>
> -#include <linux/device.h>
> -#include <linux/miscdevice.h>
> -#include <linux/string.h>
> -#include <linux/platform_device.h>
> -#include <linux/init.h>
> -#include <linux/kernel.h>
> -
> -#include <linux/uaccess.h>
> -
> -/*
> - * locking rule: all changes to requests or notifiers lists
> - * or pm_qos_object list and pm_qos_objects need to happen with pm_qos_lock
> - * held, taken with _irqsave. One lock to rule them all
> - */
> -enum pm_qos_type {
> - PM_QOS_MAX, /* return the largest value */
> - PM_QOS_MIN /* return the smallest value */
> -};
> -
> -/*
> - * Note: The lockless read path depends on the CPU accessing
> - * target_value atomically. Atomic access is only guaranteed on all CPU
> - * types linux supports for 32 bit quantites
> - */
> -struct pm_qos_object {
> - struct plist_head requests;
> - struct blocking_notifier_head *notifiers;
> - struct miscdevice pm_qos_power_miscdev;
> - char *name;
> - s32 target_value; /* Do not change to 64 bit */
> - s32 default_value;
> - enum pm_qos_type type;
> -};
> -
> -static DEFINE_SPINLOCK(pm_qos_lock);
> -
> -static struct pm_qos_object null_pm_qos;
> -static BLOCKING_NOTIFIER_HEAD(cpu_dma_lat_notifier);
> -static struct pm_qos_object cpu_dma_pm_qos = {
> - .requests = PLIST_HEAD_INIT(cpu_dma_pm_qos.requests, pm_qos_lock),
> - .notifiers = &cpu_dma_lat_notifier,
> - .name = "cpu_dma_latency",
> - .target_value = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE,
> - .default_value = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE,
> - .type = PM_QOS_MIN,
> -};
> -
> -static BLOCKING_NOTIFIER_HEAD(network_lat_notifier);
> -static struct pm_qos_object network_lat_pm_qos = {
> - .requests = PLIST_HEAD_INIT(network_lat_pm_qos.requests, pm_qos_lock),
> - .notifiers = &network_lat_notifier,
> - .name = "network_latency",
> - .target_value = PM_QOS_NETWORK_LAT_DEFAULT_VALUE,
> - .default_value = PM_QOS_NETWORK_LAT_DEFAULT_VALUE,
> - .type = PM_QOS_MIN
> -};
> -
> -
> -static BLOCKING_NOTIFIER_HEAD(network_throughput_notifier);
> -static struct pm_qos_object network_throughput_pm_qos = {
> - .requests = PLIST_HEAD_INIT(network_throughput_pm_qos.requests, pm_qos_lock),
> - .notifiers = &network_throughput_notifier,
> - .name = "network_throughput",
> - .target_value = PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE,
> - .default_value = PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE,
> - .type = PM_QOS_MAX,
> -};
> -
> -
> -static struct pm_qos_object *pm_qos_array[] = {
> - &null_pm_qos,
> - &cpu_dma_pm_qos,
> - &network_lat_pm_qos,
> - &network_throughput_pm_qos
> -};
> -
> -static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> - size_t count, loff_t *f_pos);
> -static ssize_t pm_qos_power_read(struct file *filp, char __user *buf,
> - size_t count, loff_t *f_pos);
> -static int pm_qos_power_open(struct inode *inode, struct file *filp);
> -static int pm_qos_power_release(struct inode *inode, struct file *filp);
> -
> -static const struct file_operations pm_qos_power_fops = {
> - .write = pm_qos_power_write,
> - .read = pm_qos_power_read,
> - .open = pm_qos_power_open,
> - .release = pm_qos_power_release,
> - .llseek = noop_llseek,
> -};
> -
> -/* unlocked internal variant */
> -static inline int pm_qos_get_value(struct pm_qos_object *o)
> -{
> - if (plist_head_empty(&o->requests))
> - return o->default_value;
> -
> - switch (o->type) {
> - case PM_QOS_MIN:
> - return plist_first(&o->requests)->prio;
> -
> - case PM_QOS_MAX:
> - return plist_last(&o->requests)->prio;
> -
> - default:
> - /* runtime check for not using enum */
> - BUG();
> - }
> -}
> -
> -static inline s32 pm_qos_read_value(struct pm_qos_object *o)
> -{
> - return o->target_value;
> -}
> -
> -static inline void pm_qos_set_value(struct pm_qos_object *o, s32 value)
> -{
> - o->target_value = value;
> -}
> -
> -static void update_target(struct pm_qos_object *o, struct plist_node *node,
> - int del, int value)
> -{
> - unsigned long flags;
> - int prev_value, curr_value;
> -
> - spin_lock_irqsave(&pm_qos_lock, flags);
> - prev_value = pm_qos_get_value(o);
> - /* PM_QOS_DEFAULT_VALUE is a signal that the value is unchanged */
> - if (value != PM_QOS_DEFAULT_VALUE) {
> - /*
> - * to change the list, we atomically remove, reinit
> - * with new value and add, then see if the extremal
> - * changed
> - */
> - plist_del(node, &o->requests);
> - plist_node_init(node, value);
> - plist_add(node, &o->requests);
> - } else if (del) {
> - plist_del(node, &o->requests);
> - } else {
> - plist_add(node, &o->requests);
> - }
> - curr_value = pm_qos_get_value(o);
> - pm_qos_set_value(o, curr_value);
> - spin_unlock_irqrestore(&pm_qos_lock, flags);
> -
> - if (prev_value != curr_value)
> - blocking_notifier_call_chain(o->notifiers,
> - (unsigned long)curr_value,
> - NULL);
> -}
> -
> -static int register_pm_qos_misc(struct pm_qos_object *qos)
> -{
> - qos->pm_qos_power_miscdev.minor = MISC_DYNAMIC_MINOR;
> - qos->pm_qos_power_miscdev.name = qos->name;
> - qos->pm_qos_power_miscdev.fops = &pm_qos_power_fops;
> -
> - return misc_register(&qos->pm_qos_power_miscdev);
> -}
> -
> -static int find_pm_qos_object_by_minor(int minor)
> -{
> - int pm_qos_class;
> -
> - for (pm_qos_class = 0;
> - pm_qos_class < PM_QOS_NUM_CLASSES; pm_qos_class++) {
> - if (minor ==
> - pm_qos_array[pm_qos_class]->pm_qos_power_miscdev.minor)
> - return pm_qos_class;
> - }
> - return -1;
> -}
> -
> -/**
> - * pm_qos_request - returns current system wide qos expectation
> - * @pm_qos_class: identification of which qos value is requested
> - *
> - * This function returns the current target value.
> - */
> -int pm_qos_request(int pm_qos_class)
> -{
> - return pm_qos_read_value(pm_qos_array[pm_qos_class]);
> -}
> -EXPORT_SYMBOL_GPL(pm_qos_request);
> -
> -int pm_qos_request_active(struct pm_qos_request_list *req)
> -{
> - return req->pm_qos_class != 0;
> -}
> -EXPORT_SYMBOL_GPL(pm_qos_request_active);
> -
> -/**
> - * pm_qos_add_request - inserts new qos request into the list
> - * @dep: pointer to a preallocated handle
> - * @pm_qos_class: identifies which list of qos request to use
> - * @value: defines the qos request
> - *
> - * This function inserts a new entry in the pm_qos_class list of requested qos
> - * performance characteristics. It recomputes the aggregate QoS expectations
> - * for the pm_qos_class of parameters and initializes the pm_qos_request_list
> - * handle. Caller needs to save this handle for later use in updates and
> - * removal.
> - */
> -
> -void pm_qos_add_request(struct pm_qos_request_list *dep,
> - int pm_qos_class, s32 value)
> -{
> - struct pm_qos_object *o = pm_qos_array[pm_qos_class];
> - int new_value;
> -
> - if (pm_qos_request_active(dep)) {
> - WARN(1, KERN_ERR "pm_qos_add_request() called for already added request\n");
> - return;
> - }
> - if (value == PM_QOS_DEFAULT_VALUE)
> - new_value = o->default_value;
> - else
> - new_value = value;
> - plist_node_init(&dep->list, new_value);
> - dep->pm_qos_class = pm_qos_class;
> - update_target(o, &dep->list, 0, PM_QOS_DEFAULT_VALUE);
> -}
> -EXPORT_SYMBOL_GPL(pm_qos_add_request);
> -
> -/**
> - * pm_qos_update_request - modifies an existing qos request
> - * @pm_qos_req : handle to list element holding a pm_qos request to use
> - * @value: defines the qos request
> - *
> - * Updates an existing qos request for the pm_qos_class of parameters along
> - * with updating the target pm_qos_class value.
> - *
> - * Attempts are made to make this code callable on hot code paths.
> - */
> -void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,
> - s32 new_value)
> -{
> - s32 temp;
> - struct pm_qos_object *o;
> -
> - if (!pm_qos_req) /*guard against callers passing in null */
> - return;
> -
> - if (!pm_qos_request_active(pm_qos_req)) {
> - WARN(1, KERN_ERR "pm_qos_update_request() called for unknown object\n");
> - return;
> - }
> -
> - o = pm_qos_array[pm_qos_req->pm_qos_class];
> -
> - if (new_value == PM_QOS_DEFAULT_VALUE)
> - temp = o->default_value;
> - else
> - temp = new_value;
> -
> - if (temp != pm_qos_req->list.prio)
> - update_target(o, &pm_qos_req->list, 0, temp);
> -}
> -EXPORT_SYMBOL_GPL(pm_qos_update_request);
> -
> -/**
> - * pm_qos_remove_request - modifies an existing qos request
> - * @pm_qos_req: handle to request list element
> - *
> - * Will remove pm qos request from the list of requests and
> - * recompute the current target value for the pm_qos_class. Call this
> - * on slow code paths.
> - */
> -void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req)
> -{
> - struct pm_qos_object *o;
> -
> - if (pm_qos_req == NULL)
> - return;
> - /* silent return to keep pcm code cleaner */
> -
> - if (!pm_qos_request_active(pm_qos_req)) {
> - WARN(1, KERN_ERR "pm_qos_remove_request() called for unknown object\n");
> - return;
> - }
> -
> - o = pm_qos_array[pm_qos_req->pm_qos_class];
> - update_target(o, &pm_qos_req->list, 1, PM_QOS_DEFAULT_VALUE);
> - memset(pm_qos_req, 0, sizeof(*pm_qos_req));
> -}
> -EXPORT_SYMBOL_GPL(pm_qos_remove_request);
> -
> -/**
> - * pm_qos_add_notifier - sets notification entry for changes to target value
> - * @pm_qos_class: identifies which qos target changes should be notified.
> - * @notifier: notifier block managed by caller.
> - *
> - * will register the notifier into a notification chain that gets called
> - * upon changes to the pm_qos_class target value.
> - */
> -int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier)
> -{
> - int retval;
> -
> - retval = blocking_notifier_chain_register(
> - pm_qos_array[pm_qos_class]->notifiers, notifier);
> -
> - return retval;
> -}
> -EXPORT_SYMBOL_GPL(pm_qos_add_notifier);
> -
> -/**
> - * pm_qos_remove_notifier - deletes notification entry from chain.
> - * @pm_qos_class: identifies which qos target changes are notified.
> - * @notifier: notifier block to be removed.
> - *
> - * will remove the notifier from the notification chain that gets called
> - * upon changes to the pm_qos_class target value.
> - */
> -int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier)
> -{
> - int retval;
> -
> - retval = blocking_notifier_chain_unregister(
> - pm_qos_array[pm_qos_class]->notifiers, notifier);
> -
> - return retval;
> -}
> -EXPORT_SYMBOL_GPL(pm_qos_remove_notifier);
> -
> -static int pm_qos_power_open(struct inode *inode, struct file *filp)
> -{
> - long pm_qos_class;
> -
> - pm_qos_class = find_pm_qos_object_by_minor(iminor(inode));
> - if (pm_qos_class >= 0) {
> - struct pm_qos_request_list *req = kzalloc(sizeof(*req), GFP_KERNEL);
> - if (!req)
> - return -ENOMEM;
> -
> - pm_qos_add_request(req, pm_qos_class, PM_QOS_DEFAULT_VALUE);
> - filp->private_data = req;
> -
> - if (filp->private_data)
> - return 0;
> - }
> - return -EPERM;
> -}
> -
> -static int pm_qos_power_release(struct inode *inode, struct file *filp)
> -{
> - struct pm_qos_request_list *req;
> -
> - req = filp->private_data;
> - pm_qos_remove_request(req);
> - kfree(req);
> -
> - return 0;
> -}
> -
> -
> -static ssize_t pm_qos_power_read(struct file *filp, char __user *buf,
> - size_t count, loff_t *f_pos)
> -{
> - s32 value;
> - unsigned long flags;
> - struct pm_qos_object *o;
> - struct pm_qos_request_list *pm_qos_req = filp->private_data;
> -
> - if (!pm_qos_req)
> - return -EINVAL;
> - if (!pm_qos_request_active(pm_qos_req))
> - return -EINVAL;
> -
> - o = pm_qos_array[pm_qos_req->pm_qos_class];
> - spin_lock_irqsave(&pm_qos_lock, flags);
> - value = pm_qos_get_value(o);
> - spin_unlock_irqrestore(&pm_qos_lock, flags);
> -
> - return simple_read_from_buffer(buf, count, f_pos, &value, sizeof(s32));
> -}
> -
> -static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> - size_t count, loff_t *f_pos)
> -{
> - s32 value;
> - struct pm_qos_request_list *pm_qos_req;
> -
> - if (count == sizeof(s32)) {
> - if (copy_from_user(&value, buf, sizeof(s32)))
> - return -EFAULT;
> - } else if (count <= 11) { /* ASCII perhaps? */
> - char ascii_value[11];
> - unsigned long int ulval;
> - int ret;
> -
> - if (copy_from_user(ascii_value, buf, count))
> - return -EFAULT;
> -
> - if (count > 10) {
> - if (ascii_value[10] == '\n')
> - ascii_value[10] = '\0';
> - else
> - return -EINVAL;
> - } else {
> - ascii_value[count] = '\0';
> - }
> - ret = strict_strtoul(ascii_value, 16, &ulval);
> - if (ret) {
> - pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
> - return -EINVAL;
> - }
> - value = (s32)lower_32_bits(ulval);
> - } else {
> - return -EINVAL;
> - }
> -
> - pm_qos_req = filp->private_data;
> - pm_qos_update_request(pm_qos_req, value);
> -
> - return count;
> -}
> -
> -
> -static int __init pm_qos_power_init(void)
> -{
> - int ret = 0;
> -
> - ret = register_pm_qos_misc(&cpu_dma_pm_qos);
> - if (ret < 0) {
> - printk(KERN_ERR "pm_qos_param: cpu_dma_latency setup failed\n");
> - return ret;
> - }
> - ret = register_pm_qos_misc(&network_lat_pm_qos);
> - if (ret < 0) {
> - printk(KERN_ERR "pm_qos_param: network_latency setup failed\n");
> - return ret;
> - }
> - ret = register_pm_qos_misc(&network_throughput_pm_qos);
> - if (ret < 0)
> - printk(KERN_ERR
> - "pm_qos_param: network_throughput setup failed\n");
> -
> - return ret;
> -}
> -
> -late_initcall(pm_qos_power_init);
> diff --git a/kernel/power/Makefile b/kernel/power/Makefile
> index c5ebc6a..ad6bdd8 100644
> --- a/kernel/power/Makefile
> +++ b/kernel/power/Makefile
> @@ -1,7 +1,7 @@
>
> ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG
>
> -obj-$(CONFIG_PM) += main.o
> +obj-$(CONFIG_PM) += main.o qos.o
> obj-$(CONFIG_PM_SLEEP) += console.o
> obj-$(CONFIG_FREEZER) += process.o
> obj-$(CONFIG_SUSPEND) += suspend.o
> diff --git a/kernel/power/qos.c b/kernel/power/qos.c
> new file mode 100644
> index 0000000..3bf69f1
> --- /dev/null
> +++ b/kernel/power/qos.c
> @@ -0,0 +1,481 @@
> +/*
> + * This module exposes the interface to kernel space for specifying
> + * QoS dependencies. It provides infrastructure for registration of:
> + *
> + * Dependents on a QoS value : register requests
> + * Watchers of QoS value : get notified when target QoS value changes
> + *
> + * This QoS design is best effort based. Dependents register their QoS needs.
> + * Watchers register to keep track of the current QoS needs of the system.
> + *
> + * There are 3 basic classes of QoS parameter: latency, timeout, throughput
> + * each have defined units:
> + * latency: usec
> + * timeout: usec <-- currently not used.
> + * throughput: kbs (kilo byte / sec)
> + *
> + * There are lists of pm_qos_objects each one wrapping requests, notifiers
> + *
> + * User mode requests on a QOS parameter register themselves to the
> + * subsystem by opening the device node /dev/... and writing there request to
> + * the node. As long as the process holds a file handle open to the node the
> + * client continues to be accounted for. Upon file release the usermode
> + * request is removed and a new qos target is computed. This way when the
> + * request that the application has is cleaned up when closes the file
> + * pointer or exits the pm_qos_object will get an opportunity to clean up.
> + *
> + * Mark Gross <mgross@xxxxxxxxxxxxxxx>
> + */
> +
> +/*#define DEBUG*/
> +
> +#include <linux/pm_qos.h>
> +#include <linux/sched.h>
> +#include <linux/spinlock.h>
> +#include <linux/slab.h>
> +#include <linux/time.h>
> +#include <linux/fs.h>
> +#include <linux/device.h>
> +#include <linux/miscdevice.h>
> +#include <linux/string.h>
> +#include <linux/platform_device.h>
> +#include <linux/init.h>
> +#include <linux/kernel.h>
> +
> +#include <linux/uaccess.h>
> +
> +/*
> + * locking rule: all changes to requests or notifiers lists
> + * or pm_qos_object list and pm_qos_objects need to happen with pm_qos_lock
> + * held, taken with _irqsave. One lock to rule them all
> + */
> +enum pm_qos_type {
> + PM_QOS_MAX, /* return the largest value */
> + PM_QOS_MIN /* return the smallest value */
> +};
> +
> +/*
> + * Note: The lockless read path depends on the CPU accessing
> + * target_value atomically. Atomic access is only guaranteed on all CPU
> + * types linux supports for 32 bit quantites
> + */
> +struct pm_qos_object {
> + struct plist_head requests;
> + struct blocking_notifier_head *notifiers;
> + struct miscdevice pm_qos_power_miscdev;
> + char *name;
> + s32 target_value; /* Do not change to 64 bit */
> + s32 default_value;
> + enum pm_qos_type type;
> +};
> +
> +static DEFINE_SPINLOCK(pm_qos_lock);
> +
> +static struct pm_qos_object null_pm_qos;
> +static BLOCKING_NOTIFIER_HEAD(cpu_dma_lat_notifier);
> +static struct pm_qos_object cpu_dma_pm_qos = {
> + .requests = PLIST_HEAD_INIT(cpu_dma_pm_qos.requests, pm_qos_lock),
> + .notifiers = &cpu_dma_lat_notifier,
> + .name = "cpu_dma_latency",
> + .target_value = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE,
> + .default_value = PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE,
> + .type = PM_QOS_MIN,
> +};
> +
> +static BLOCKING_NOTIFIER_HEAD(network_lat_notifier);
> +static struct pm_qos_object network_lat_pm_qos = {
> + .requests = PLIST_HEAD_INIT(network_lat_pm_qos.requests, pm_qos_lock),
> + .notifiers = &network_lat_notifier,
> + .name = "network_latency",
> + .target_value = PM_QOS_NETWORK_LAT_DEFAULT_VALUE,
> + .default_value = PM_QOS_NETWORK_LAT_DEFAULT_VALUE,
> + .type = PM_QOS_MIN
> +};
> +
> +
> +static BLOCKING_NOTIFIER_HEAD(network_throughput_notifier);
> +static struct pm_qos_object network_throughput_pm_qos = {
> + .requests = PLIST_HEAD_INIT(network_throughput_pm_qos.requests, pm_qos_lock),
> + .notifiers = &network_throughput_notifier,
> + .name = "network_throughput",
> + .target_value = PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE,
> + .default_value = PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE,
> + .type = PM_QOS_MAX,
> +};
> +
> +
> +static struct pm_qos_object *pm_qos_array[] = {
> + &null_pm_qos,
> + &cpu_dma_pm_qos,
> + &network_lat_pm_qos,
> + &network_throughput_pm_qos
> +};
> +
> +static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> + size_t count, loff_t *f_pos);
> +static ssize_t pm_qos_power_read(struct file *filp, char __user *buf,
> + size_t count, loff_t *f_pos);
> +static int pm_qos_power_open(struct inode *inode, struct file *filp);
> +static int pm_qos_power_release(struct inode *inode, struct file *filp);
> +
> +static const struct file_operations pm_qos_power_fops = {
> + .write = pm_qos_power_write,
> + .read = pm_qos_power_read,
> + .open = pm_qos_power_open,
> + .release = pm_qos_power_release,
> + .llseek = noop_llseek,
> +};
> +
> +/* unlocked internal variant */
> +static inline int pm_qos_get_value(struct pm_qos_object *o)
> +{
> + if (plist_head_empty(&o->requests))
> + return o->default_value;
> +
> + switch (o->type) {
> + case PM_QOS_MIN:
> + return plist_first(&o->requests)->prio;
> +
> + case PM_QOS_MAX:
> + return plist_last(&o->requests)->prio;
> +
> + default:
> + /* runtime check for not using enum */
> + BUG();
> + }
> +}
> +
> +static inline s32 pm_qos_read_value(struct pm_qos_object *o)
> +{
> + return o->target_value;
> +}
> +
> +static inline void pm_qos_set_value(struct pm_qos_object *o, s32 value)
> +{
> + o->target_value = value;
> +}
> +
> +static void update_target(struct pm_qos_object *o, struct plist_node *node,
> + int del, int value)
> +{
> + unsigned long flags;
> + int prev_value, curr_value;
> +
> + spin_lock_irqsave(&pm_qos_lock, flags);
> + prev_value = pm_qos_get_value(o);
> + /* PM_QOS_DEFAULT_VALUE is a signal that the value is unchanged */
> + if (value != PM_QOS_DEFAULT_VALUE) {
> + /*
> + * to change the list, we atomically remove, reinit
> + * with new value and add, then see if the extremal
> + * changed
> + */
> + plist_del(node, &o->requests);
> + plist_node_init(node, value);
> + plist_add(node, &o->requests);
> + } else if (del) {
> + plist_del(node, &o->requests);
> + } else {
> + plist_add(node, &o->requests);
> + }
> + curr_value = pm_qos_get_value(o);
> + pm_qos_set_value(o, curr_value);
> + spin_unlock_irqrestore(&pm_qos_lock, flags);
> +
> + if (prev_value != curr_value)
> + blocking_notifier_call_chain(o->notifiers,
> + (unsigned long)curr_value,
> + NULL);
> +}
> +
> +static int register_pm_qos_misc(struct pm_qos_object *qos)
> +{
> + qos->pm_qos_power_miscdev.minor = MISC_DYNAMIC_MINOR;
> + qos->pm_qos_power_miscdev.name = qos->name;
> + qos->pm_qos_power_miscdev.fops = &pm_qos_power_fops;
> +
> + return misc_register(&qos->pm_qos_power_miscdev);
> +}
> +
> +static int find_pm_qos_object_by_minor(int minor)
> +{
> + int pm_qos_class;
> +
> + for (pm_qos_class = 0;
> + pm_qos_class < PM_QOS_NUM_CLASSES; pm_qos_class++) {
> + if (minor ==
> + pm_qos_array[pm_qos_class]->pm_qos_power_miscdev.minor)
> + return pm_qos_class;
> + }
> + return -1;
> +}
> +
> +/**
> + * pm_qos_request - returns current system wide qos expectation
> + * @pm_qos_class: identification of which qos value is requested
> + *
> + * This function returns the current target value.
> + */
> +int pm_qos_request(int pm_qos_class)
> +{
> + return pm_qos_read_value(pm_qos_array[pm_qos_class]);
> +}
> +EXPORT_SYMBOL_GPL(pm_qos_request);
> +
> +int pm_qos_request_active(struct pm_qos_request_list *req)
> +{
> + return req->pm_qos_class != 0;
> +}
> +EXPORT_SYMBOL_GPL(pm_qos_request_active);
> +
> +/**
> + * pm_qos_add_request - inserts new qos request into the list
> + * @dep: pointer to a preallocated handle
> + * @pm_qos_class: identifies which list of qos request to use
> + * @value: defines the qos request
> + *
> + * This function inserts a new entry in the pm_qos_class list of requested qos
> + * performance characteristics. It recomputes the aggregate QoS expectations
> + * for the pm_qos_class of parameters and initializes the pm_qos_request_list
> + * handle. Caller needs to save this handle for later use in updates and
> + * removal.
> + */
> +
> +void pm_qos_add_request(struct pm_qos_request_list *dep,
> + int pm_qos_class, s32 value)
> +{
> + struct pm_qos_object *o = pm_qos_array[pm_qos_class];
> + int new_value;
> +
> + if (pm_qos_request_active(dep)) {
> + WARN(1, KERN_ERR "pm_qos_add_request() called for already added request\n");
> + return;
> + }
> + if (value == PM_QOS_DEFAULT_VALUE)
> + new_value = o->default_value;
> + else
> + new_value = value;
> + plist_node_init(&dep->list, new_value);
> + dep->pm_qos_class = pm_qos_class;
> + update_target(o, &dep->list, 0, PM_QOS_DEFAULT_VALUE);
> +}
> +EXPORT_SYMBOL_GPL(pm_qos_add_request);
> +
> +/**
> + * pm_qos_update_request - modifies an existing qos request
> + * @pm_qos_req : handle to list element holding a pm_qos request to use
> + * @value: defines the qos request
> + *
> + * Updates an existing qos request for the pm_qos_class of parameters along
> + * with updating the target pm_qos_class value.
> + *
> + * Attempts are made to make this code callable on hot code paths.
> + */
> +void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,
> + s32 new_value)
> +{
> + s32 temp;
> + struct pm_qos_object *o;
> +
> + if (!pm_qos_req) /*guard against callers passing in null */
> + return;
> +
> + if (!pm_qos_request_active(pm_qos_req)) {
> + WARN(1, KERN_ERR "pm_qos_update_request() called for unknown object\n");
> + return;
> + }
> +
> + o = pm_qos_array[pm_qos_req->pm_qos_class];
> +
> + if (new_value == PM_QOS_DEFAULT_VALUE)
> + temp = o->default_value;
> + else
> + temp = new_value;
> +
> + if (temp != pm_qos_req->list.prio)
> + update_target(o, &pm_qos_req->list, 0, temp);
> +}
> +EXPORT_SYMBOL_GPL(pm_qos_update_request);
> +
> +/**
> + * pm_qos_remove_request - modifies an existing qos request
> + * @pm_qos_req: handle to request list element
> + *
> + * Will remove pm qos request from the list of requests and
> + * recompute the current target value for the pm_qos_class. Call this
> + * on slow code paths.
> + */
> +void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req)
> +{
> + struct pm_qos_object *o;
> +
> + if (pm_qos_req == NULL)
> + return;
> + /* silent return to keep pcm code cleaner */
> +
> + if (!pm_qos_request_active(pm_qos_req)) {
> + WARN(1, KERN_ERR "pm_qos_remove_request() called for unknown object\n");
> + return;
> + }
> +
> + o = pm_qos_array[pm_qos_req->pm_qos_class];
> + update_target(o, &pm_qos_req->list, 1, PM_QOS_DEFAULT_VALUE);
> + memset(pm_qos_req, 0, sizeof(*pm_qos_req));
> +}
> +EXPORT_SYMBOL_GPL(pm_qos_remove_request);
> +
> +/**
> + * pm_qos_add_notifier - sets notification entry for changes to target value
> + * @pm_qos_class: identifies which qos target changes should be notified.
> + * @notifier: notifier block managed by caller.
> + *
> + * will register the notifier into a notification chain that gets called
> + * upon changes to the pm_qos_class target value.
> + */
> +int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier)
> +{
> + int retval;
> +
> + retval = blocking_notifier_chain_register(
> + pm_qos_array[pm_qos_class]->notifiers, notifier);
> +
> + return retval;
> +}
> +EXPORT_SYMBOL_GPL(pm_qos_add_notifier);
> +
> +/**
> + * pm_qos_remove_notifier - deletes notification entry from chain.
> + * @pm_qos_class: identifies which qos target changes are notified.
> + * @notifier: notifier block to be removed.
> + *
> + * will remove the notifier from the notification chain that gets called
> + * upon changes to the pm_qos_class target value.
> + */
> +int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier)
> +{
> + int retval;
> +
> + retval = blocking_notifier_chain_unregister(
> + pm_qos_array[pm_qos_class]->notifiers, notifier);
> +
> + return retval;
> +}
> +EXPORT_SYMBOL_GPL(pm_qos_remove_notifier);
> +
> +static int pm_qos_power_open(struct inode *inode, struct file *filp)
> +{
> + long pm_qos_class;
> +
> + pm_qos_class = find_pm_qos_object_by_minor(iminor(inode));
> + if (pm_qos_class >= 0) {
> + struct pm_qos_request_list *req = kzalloc(sizeof(*req), GFP_KERNEL);
> + if (!req)
> + return -ENOMEM;
> +
> + pm_qos_add_request(req, pm_qos_class, PM_QOS_DEFAULT_VALUE);
> + filp->private_data = req;
> +
> + if (filp->private_data)
> + return 0;
> + }
> + return -EPERM;
> +}
> +
> +static int pm_qos_power_release(struct inode *inode, struct file *filp)
> +{
> + struct pm_qos_request_list *req;
> +
> + req = filp->private_data;
> + pm_qos_remove_request(req);
> + kfree(req);
> +
> + return 0;
> +}
> +
> +
> +static ssize_t pm_qos_power_read(struct file *filp, char __user *buf,
> + size_t count, loff_t *f_pos)
> +{
> + s32 value;
> + unsigned long flags;
> + struct pm_qos_object *o;
> + struct pm_qos_request_list *pm_qos_req = filp->private_data;
> +
> + if (!pm_qos_req)
> + return -EINVAL;
> + if (!pm_qos_request_active(pm_qos_req))
> + return -EINVAL;
> +
> + o = pm_qos_array[pm_qos_req->pm_qos_class];
> + spin_lock_irqsave(&pm_qos_lock, flags);
> + value = pm_qos_get_value(o);
> + spin_unlock_irqrestore(&pm_qos_lock, flags);
> +
> + return simple_read_from_buffer(buf, count, f_pos, &value, sizeof(s32));
> +}
> +
> +static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
> + size_t count, loff_t *f_pos)
> +{
> + s32 value;
> + struct pm_qos_request_list *pm_qos_req;
> +
> + if (count == sizeof(s32)) {
> + if (copy_from_user(&value, buf, sizeof(s32)))
> + return -EFAULT;
> + } else if (count <= 11) { /* ASCII perhaps? */
> + char ascii_value[11];
> + unsigned long int ulval;
> + int ret;
> +
> + if (copy_from_user(ascii_value, buf, count))
> + return -EFAULT;
> +
> + if (count > 10) {
> + if (ascii_value[10] == '\n')
> + ascii_value[10] = '\0';
> + else
> + return -EINVAL;
> + } else {
> + ascii_value[count] = '\0';
> + }
> + ret = strict_strtoul(ascii_value, 16, &ulval);
> + if (ret) {
> + pr_debug("%s, 0x%lx, 0x%x\n", ascii_value, ulval, ret);
> + return -EINVAL;
> + }
> + value = (s32)lower_32_bits(ulval);
> + } else {
> + return -EINVAL;
> + }
> +
> + pm_qos_req = filp->private_data;
> + pm_qos_update_request(pm_qos_req, value);
> +
> + return count;
> +}
> +
> +
> +static int __init pm_qos_power_init(void)
> +{
> + int ret = 0;
> +
> + ret = register_pm_qos_misc(&cpu_dma_pm_qos);
> + if (ret < 0) {
> + printk(KERN_ERR "pm_qos_param: cpu_dma_latency setup failed\n");
> + return ret;
> + }
> + ret = register_pm_qos_misc(&network_lat_pm_qos);
> + if (ret < 0) {
> + printk(KERN_ERR "pm_qos_param: network_latency setup failed\n");
> + return ret;
> + }
> + ret = register_pm_qos_misc(&network_throughput_pm_qos);
> + if (ret < 0)
> + printk(KERN_ERR
> + "pm_qos_param: network_throughput setup failed\n");
> +
> + return ret;
> +}
> +
> +late_initcall(pm_qos_power_init);
> diff --git a/net/mac80211/main.c b/net/mac80211/main.c
> index 866f269..bb771e9 100644
> --- a/net/mac80211/main.c
> +++ b/net/mac80211/main.c
> @@ -19,7 +19,7 @@
> #include <linux/if_arp.h>
> #include <linux/rtnetlink.h>
> #include <linux/bitmap.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/inetdevice.h>
> #include <net/net_namespace.h>
> #include <net/cfg80211.h>
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index d595265..f07705d 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -17,7 +17,7 @@
> #include <linux/if_arp.h>
> #include <linux/etherdevice.h>
> #include <linux/rtnetlink.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/crc32.h>
> #include <linux/slab.h>
> #include <net/mac80211.h>
> diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
> index 58ffa7d..41393c4 100644
> --- a/net/mac80211/scan.c
> +++ b/net/mac80211/scan.c
> @@ -14,7 +14,7 @@
>
> #include <linux/if_arp.h>
> #include <linux/rtnetlink.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <net/sch_generic.h>
> #include <linux/slab.h>
> #include <net/mac80211.h>
> diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
> index 1c6be91..c74e228 100644
> --- a/sound/core/pcm_native.c
> +++ b/sound/core/pcm_native.c
> @@ -23,7 +23,7 @@
> #include <linux/file.h>
> #include <linux/slab.h>
> #include <linux/time.h>
> -#include <linux/pm_qos_params.h>
> +#include <linux/pm_qos.h>
> #include <linux/uio.h>
> #include <linux/dma-mapping.h>
> #include <sound/core.h>
> --
> 1.7.2.5
Acked-by: markgross <markgross@xxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
