hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PM QOS update 

This patch changes the string based list management to a handle base
implementation to help with the hot path use of pm-qos, it also renames
much of the API to use "request" as opposed to "requirement" that was
used in the initial implementation.  I did this because request more
accurately represents what it actually does.

Also, I added a string based ABI for users wanting to use a string
interface.  So if the user writes 0xDDDDDDDD formatted hex it will be
accepted by the interface.  (someone asked me for it and I don't think
it hurts anything.)

This patch updates some documentation input I got from Randy.

Signed-off-by: markgross <mgross@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Mark Gross 2010-05-06 01:59:26 +02:00 committed by Rafael J. Wysocki
parent 0fef8b1e83
commit ed77134bfc
14 changed files with 175 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Documentation/power/pm_qos_interface.txt
View File

@ -18,44 +18,46 @@ and pm_qos_params.h. This is done because having the available parameters
being runtime configurable or changeable from a driver was seen as too easy to being runtime configurable or changeable from a driver was seen as too easy to
abuse. abuse.
For each parameter a list of performance requirements is maintained along with For each parameter a list of performance requests is maintained along with
an aggregated target value. The aggregated target value is updated with an aggregated target value. The aggregated target value is updated with
changes to the requirement list or elements of the list. Typically the changes to the request list or elements of the list. Typically the
aggregated target value is simply the max or min of the requirement values held aggregated target value is simply the max or min of the request values held
in the parameter list elements. in the parameter list elements.
From kernel mode the use of this interface is simple: From kernel mode the use of this interface is simple:
pm_qos_add_requirement(param_id, name, target_value):
Will insert a named element in the list for that identified PM_QOS parameter
with the target value. Upon change to this list the new target is recomputed
and any registered notifiers are called only if the target value is now
different.
pm_qos_update_requirement(param_id, name, new_target_value): handle = pm_qos_add_request(param_class, target_value):
Will search the list identified by the param_id for the named list element and Will insert an element into the list for that identified PM_QOS class with the
then update its target value, calling the notification tree if the aggregated target value. Upon change to this list the new target is recomputed and any
target is changed. with that name is already registered. registered notifiers are called only if the target value is now different.
Clients of pm_qos need to save the returned handle.
pm_qos_remove_requirement(param_id, name): void pm_qos_update_request(handle, new_target_value):
Will search the identified list for the named element and remove it, after Will update the list element pointed to by the handle with the new target value
removal it will update the aggregate target and call the notification tree if and recompute the new aggregated target, calling the notification tree if the
the target was changed as a result of removing the named requirement. target is changed.
void pm_qos_remove_request(handle):
Will remove the element. After removal it will update the aggregate target and
call the notification tree if the target was changed as a result of removing
the request.
From user mode: From user mode:
Only processes can register a pm_qos requirement. To provide for automatic Only processes can register a pm_qos request. To provide for automatic
cleanup for process the interface requires the process to register its cleanup of a process, the interface requires the process to register its
parameter requirements in the following way: parameter requests in the following way:
To register the default pm_qos target for the specific parameter, the process To register the default pm_qos target for the specific parameter, the process
must open one of /dev/[cpu_dma_latency, network_latency, network_throughput] must open one of /dev/[cpu_dma_latency, network_latency, network_throughput]
As long as the device node is held open that process has a registered As long as the device node is held open that process has a registered
requirement on the parameter. The name of the requirement is "process_<PID>" request on the parameter.
derived from the current->pid from within the open system call.
To change the requested target value the process needs to write a s32 value to To change the requested target value the process needs to write an s32 value to
the open device node. This translates to a pm_qos_update_requirement call. the open device node. Alternatively the user mode program could write a hex
string for the value using 10 char long format e.g. "0x12345678". This
translates to a pm_qos_update_request call.
To remove the user mode request for a target value simply close the device To remove the user mode request for a target value simply close the device
node. node.

2
drivers/acpi/processor_idle.c
View File

@ -698,7 +698,7 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
"max_cstate: C%d\n" "max_cstate: C%d\n"
"maximum allowed latency: %d usec\n", "maximum allowed latency: %d usec\n",
pr->power.state ? pr->power.state - pr->power.states : 0, pr->power.state ? pr->power.state - pr->power.states : 0,
max_cstate, pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY)); max_cstate, pm_qos_request(PM_QOS_CPU_DMA_LATENCY));
seq_puts(seq, "states:\n"); seq_puts(seq, "states:\n");

2
drivers/cpuidle/governors/ladder.c
View File

@ -67,7 +67,7 @@ static int ladder_select_state(struct cpuidle_device *dev)
struct ladder_device *ldev = &__get_cpu_var(ladder_devices); struct ladder_device *ldev = &__get_cpu_var(ladder_devices);
struct ladder_device_state *last_state; struct ladder_device_state *last_state;
int last_residency, last_idx = ldev->last_state_idx; int last_residency, last_idx = ldev->last_state_idx;
int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY); int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
/* Special case when user has set very strict latency requirement */ /* Special case when user has set very strict latency requirement */
if (unlikely(latency_req == 0)) { if (unlikely(latency_req == 0)) {

2
drivers/cpuidle/governors/menu.c
View File

@ -182,7 +182,7 @@ static u64 div_round64(u64 dividend, u32 divisor)
static int menu_select(struct cpuidle_device *dev) static int menu_select(struct cpuidle_device *dev)
{ {
struct menu_device *data = &__get_cpu_var(menu_devices); struct menu_device *data = &__get_cpu_var(menu_devices);
int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY); int latency_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
int i; int i;
int multiplier; int multiplier;

22
drivers/net/e1000e/netdev.c
View File

@ -2524,12 +2524,12 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
* excessive C-state transition latencies result in * excessive C-state transition latencies result in
* dropped transactions. * dropped transactions.
*/ */
pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, pm_qos_update_request(
adapter->netdev->name, 55); adapter->netdev->pm_qos_req, 55);
} else { } else {
pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, pm_qos_update_request(
adapter->netdev->name, adapter->netdev->pm_qos_req,
PM_QOS_DEFAULT_VALUE); PM_QOS_DEFAULT_VALUE);
} }
} }
@ -2824,8 +2824,8 @@ int e1000e_up(struct e1000_adapter *adapter)
/* DMA latency requirement to workaround early-receive/jumbo issue */ /* DMA latency requirement to workaround early-receive/jumbo issue */
if (adapter->flags & FLAG_HAS_ERT) if (adapter->flags & FLAG_HAS_ERT)
pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, adapter->netdev->pm_qos_req =
adapter->netdev->name, pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
PM_QOS_DEFAULT_VALUE); PM_QOS_DEFAULT_VALUE);
/* hardware has been reset, we need to reload some things */ /* hardware has been reset, we need to reload some things */
@ -2887,9 +2887,11 @@ void e1000e_down(struct e1000_adapter *adapter)
e1000_clean_tx_ring(adapter); e1000_clean_tx_ring(adapter);
e1000_clean_rx_ring(adapter); e1000_clean_rx_ring(adapter);
if (adapter->flags & FLAG_HAS_ERT) if (adapter->flags & FLAG_HAS_ERT) {
pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY, pm_qos_remove_request(
adapter->netdev->name); adapter->netdev->pm_qos_req);
adapter->netdev->pm_qos_req = NULL;
}
/* /*
* TODO: for power management, we could drop the link and * TODO: for power management, we could drop the link and

6
drivers/net/igbvf/netdev.c
View File

@ -48,6 +48,7 @@
#define DRV_VERSION "1.0.0-k0" #define DRV_VERSION "1.0.0-k0"
char igbvf_driver_name[] = "igbvf"; char igbvf_driver_name[] = "igbvf";
const char igbvf_driver_version[] = DRV_VERSION; const char igbvf_driver_version[] = DRV_VERSION;
struct pm_qos_request_list *igbvf_driver_pm_qos_req;
static const char igbvf_driver_string[] = static const char igbvf_driver_string[] =
"Intel(R) Virtual Function Network Driver"; "Intel(R) Virtual Function Network Driver";
static const char igbvf_copyright[] = "Copyright (c) 2009 Intel Corporation."; static const char igbvf_copyright[] = "Copyright (c) 2009 Intel Corporation.";
@ -2899,7 +2900,7 @@ static int __init igbvf_init_module(void)
printk(KERN_INFO "%s\n", igbvf_copyright); printk(KERN_INFO "%s\n", igbvf_copyright);
ret = pci_register_driver(&igbvf_driver); ret = pci_register_driver(&igbvf_driver);
pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, igbvf_driver_name, igbvf_driver_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
PM_QOS_DEFAULT_VALUE); PM_QOS_DEFAULT_VALUE);
return ret; return ret;
@ -2915,7 +2916,8 @@ module_init(igbvf_init_module);
static void __exit igbvf_exit_module(void) static void __exit igbvf_exit_module(void)
{ {
pci_unregister_driver(&igbvf_driver); pci_unregister_driver(&igbvf_driver);
pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY, igbvf_driver_name); pm_qos_remove_request(igbvf_driver_pm_qos_req);
igbvf_driver_pm_qos_req = NULL;
} }
module_exit(igbvf_exit_module); module_exit(igbvf_exit_module);

11
drivers/net/wireless/ipw2x00/ipw2100.c
View File

@ -174,6 +174,8 @@ that only one external action is invoked at a time.
#define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver" #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver"
#define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation"
struct pm_qos_request_list *ipw2100_pm_qos_req;
/* Debugging stuff */ /* Debugging stuff */
#ifdef CONFIG_IPW2100_DEBUG #ifdef CONFIG_IPW2100_DEBUG
#define IPW2100_RX_DEBUG /* Reception debugging */ #define IPW2100_RX_DEBUG /* Reception debugging */
@ -1739,7 +1741,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred)
/* the ipw2100 hardware really doesn't want power management delays /* the ipw2100 hardware really doesn't want power management delays
* longer than 175usec * longer than 175usec
*/ */
pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100", 175); pm_qos_update_request(ipw2100_pm_qos_req, 175);
/* If the interrupt is enabled, turn it off... */ /* If the interrupt is enabled, turn it off... */
spin_lock_irqsave(&priv->low_lock, flags); spin_lock_irqsave(&priv->low_lock, flags);
@ -1887,8 +1889,7 @@ static void ipw2100_down(struct ipw2100_priv *priv)
ipw2100_disable_interrupts(priv); ipw2100_disable_interrupts(priv);
spin_unlock_irqrestore(&priv->low_lock, flags); spin_unlock_irqrestore(&priv->low_lock, flags);
pm_qos_update_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100", pm_qos_update_request(ipw2100_pm_qos_req, PM_QOS_DEFAULT_VALUE);
PM_QOS_DEFAULT_VALUE);
/* We have to signal any supplicant if we are disassociating */ /* We have to signal any supplicant if we are disassociating */
if (associated) if (associated)
@ -6669,7 +6670,7 @@ static int __init ipw2100_init(void)
if (ret) if (ret)
goto out; goto out;
pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100", ipw2100_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
PM_QOS_DEFAULT_VALUE); PM_QOS_DEFAULT_VALUE);
#ifdef CONFIG_IPW2100_DEBUG #ifdef CONFIG_IPW2100_DEBUG
ipw2100_debug_level = debug; ipw2100_debug_level = debug;
@ -6692,7 +6693,7 @@ static void __exit ipw2100_exit(void)
&driver_attr_debug_level); &driver_attr_debug_level);
#endif #endif
pci_unregister_driver(&ipw2100_pci_driver); pci_unregister_driver(&ipw2100_pci_driver);
pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100"); pm_qos_remove_request(ipw2100_pm_qos_req);
} }
module_init(ipw2100_init); module_init(ipw2100_init);

4
include/linux/netdevice.h
View File

@ -31,6 +31,7 @@
#include <linux/if_link.h> #include <linux/if_link.h>
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/pm_qos_params.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mm.h> #include <linux/mm.h>
@ -711,6 +712,9 @@ struct net_device {
* the interface. * the interface.
*/ */
char name[IFNAMSIZ]; char name[IFNAMSIZ];
struct pm_qos_request_list *pm_qos_req;
/* device name hash chain */ /* device name hash chain */
struct hlist_node name_hlist; struct hlist_node name_hlist;
/* snmp alias */ /* snmp alias */

14
include/linux/pm_qos_params.h
View File

@ -14,12 +14,14 @@
#define PM_QOS_NUM_CLASSES 4 #define PM_QOS_NUM_CLASSES 4
#define PM_QOS_DEFAULT_VALUE -1 #define PM_QOS_DEFAULT_VALUE -1
int pm_qos_add_requirement(int qos, char *name, s32 value); struct pm_qos_request_list;
int pm_qos_update_requirement(int qos, char *name, s32 new_value);
void pm_qos_remove_requirement(int qos, char *name);
int pm_qos_requirement(int qos); struct pm_qos_request_list *pm_qos_add_request(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_add_notifier(int qos, struct notifier_block *notifier); int pm_qos_request(int pm_qos_class);
int pm_qos_remove_notifier(int qos, struct notifier_block *notifier); 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);

3
include/sound/pcm.h
View File

@ -29,6 +29,7 @@
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/pm_qos_params.h>
#define snd_pcm_substream_chip(substream) ((substream)->private_data) #define snd_pcm_substream_chip(substream) ((substream)->private_data)
#define snd_pcm_chip(pcm) ((pcm)->private_data) #define snd_pcm_chip(pcm) ((pcm)->private_data)
@ -365,7 +366,7 @@ struct snd_pcm_substream {
int number; int number;
char name[32]; /* substream name */ char name[32]; /* substream name */
int stream; /* stream (direction) */ int stream; /* stream (direction) */
char latency_id[20]; /* latency identifier */ struct pm_qos_request_list *latency_pm_qos_req; /* pm_qos request */
size_t buffer_bytes_max; /* limit ring buffer size */ size_t buffer_bytes_max; /* limit ring buffer size */
struct snd_dma_buffer dma_buffer; struct snd_dma_buffer dma_buffer;
unsigned int dma_buf_id; unsigned int dma_buf_id;

212
kernel/pm_qos_params.c
View File

@ -2,7 +2,7 @@
* This module exposes the interface to kernel space for specifying * This module exposes the interface to kernel space for specifying
* QoS dependencies. It provides infrastructure for registration of: * QoS dependencies. It provides infrastructure for registration of:
* *
* Dependents on a QoS value : register requirements * Dependents on a QoS value : register requests
* Watchers of QoS value : get notified when target QoS value changes * Watchers of QoS value : get notified when target QoS value changes
* *
* This QoS design is best effort based. Dependents register their QoS needs. * This QoS design is best effort based. Dependents register their QoS needs.
@ -14,19 +14,21 @@
* timeout: usec <-- currently not used. * timeout: usec <-- currently not used.
* throughput: kbs (kilo byte / sec) * throughput: kbs (kilo byte / sec)
* *
* There are lists of pm_qos_objects each one wrapping requirements, notifiers * There are lists of pm_qos_objects each one wrapping requests, notifiers
* *
* User mode requirements on a QOS parameter register themselves to the * User mode requests on a QOS parameter register themselves to the
* subsystem by opening the device node /dev/... and writing there request to * 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 * 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 * client continues to be accounted for. Upon file release the usermode
* requirement is removed and a new qos target is computed. This way when the * request is removed and a new qos target is computed. This way when the
* requirement that the application has is cleaned up when closes the file * 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. * pointer or exits the pm_qos_object will get an opportunity to clean up.
* *
* Mark Gross <mgross@linux.intel.com> * Mark Gross <mgross@linux.intel.com>
*/ */
/*#define DEBUG*/
#include <linux/pm_qos_params.h> #include <linux/pm_qos_params.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
@ -42,25 +44,25 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
/* /*
* locking rule: all changes to requirements or notifiers lists * 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 * 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 * held, taken with _irqsave. One lock to rule them all
*/ */
struct requirement_list { struct pm_qos_request_list {
struct list_head list; struct list_head list;
union { union {
s32 value; s32 value;
s32 usec; s32 usec;
s32 kbps; s32 kbps;
}; };
char *name; int pm_qos_class;
}; };
static s32 max_compare(s32 v1, s32 v2); static s32 max_compare(s32 v1, s32 v2);
static s32 min_compare(s32 v1, s32 v2); static s32 min_compare(s32 v1, s32 v2);
struct pm_qos_object { struct pm_qos_object {
struct requirement_list requirements; struct pm_qos_request_list requests;
struct blocking_notifier_head *notifiers; struct blocking_notifier_head *notifiers;
struct miscdevice pm_qos_power_miscdev; struct miscdevice pm_qos_power_miscdev;
char *name; char *name;
@ -72,7 +74,7 @@ struct pm_qos_object {
static struct pm_qos_object null_pm_qos; static struct pm_qos_object null_pm_qos;
static BLOCKING_NOTIFIER_HEAD(cpu_dma_lat_notifier); static BLOCKING_NOTIFIER_HEAD(cpu_dma_lat_notifier);
static struct pm_qos_object cpu_dma_pm_qos = { static struct pm_qos_object cpu_dma_pm_qos = {
.requirements = {LIST_HEAD_INIT(cpu_dma_pm_qos.requirements.list)}, .requests = {LIST_HEAD_INIT(cpu_dma_pm_qos.requests.list)},
.notifiers = &cpu_dma_lat_notifier, .notifiers = &cpu_dma_lat_notifier,
.name = "cpu_dma_latency", .name = "cpu_dma_latency",
.default_value = 2000 * USEC_PER_SEC, .default_value = 2000 * USEC_PER_SEC,
@ -82,7 +84,7 @@ static struct pm_qos_object cpu_dma_pm_qos = {
static BLOCKING_NOTIFIER_HEAD(network_lat_notifier); static BLOCKING_NOTIFIER_HEAD(network_lat_notifier);
static struct pm_qos_object network_lat_pm_qos = { static struct pm_qos_object network_lat_pm_qos = {
.requirements = {LIST_HEAD_INIT(network_lat_pm_qos.requirements.list)}, .requests = {LIST_HEAD_INIT(network_lat_pm_qos.requests.list)},
.notifiers = &network_lat_notifier, .notifiers = &network_lat_notifier,
.name = "network_latency", .name = "network_latency",
.default_value = 2000 * USEC_PER_SEC, .default_value = 2000 * USEC_PER_SEC,
@ -93,8 +95,7 @@ static struct pm_qos_object network_lat_pm_qos = {
static BLOCKING_NOTIFIER_HEAD(network_throughput_notifier); static BLOCKING_NOTIFIER_HEAD(network_throughput_notifier);
static struct pm_qos_object network_throughput_pm_qos = { static struct pm_qos_object network_throughput_pm_qos = {
.requirements = .requests = {LIST_HEAD_INIT(network_throughput_pm_qos.requests.list)},
{LIST_HEAD_INIT(network_throughput_pm_qos.requirements.list)},
.notifiers = &network_throughput_notifier, .notifiers = &network_throughput_notifier,
.name = "network_throughput", .name = "network_throughput",
.default_value = 0, .default_value = 0,
@ -135,31 +136,34 @@ static s32 min_compare(s32 v1, s32 v2)
} }
static void update_target(int target) static void update_target(int pm_qos_class)
{ {
s32 extreme_value; s32 extreme_value;
struct requirement_list *node; struct pm_qos_request_list *node;
unsigned long flags; unsigned long flags;
int call_notifier = 0; int call_notifier = 0;
spin_lock_irqsave(&pm_qos_lock, flags); spin_lock_irqsave(&pm_qos_lock, flags);
extreme_value = pm_qos_array[target]->default_value; extreme_value = pm_qos_array[pm_qos_class]->default_value;
list_for_each_entry(node, list_for_each_entry(node,
&pm_qos_array[target]->requirements.list, list) { &pm_qos_array[pm_qos_class]->requests.list, list) {
extreme_value = pm_qos_array[target]->comparitor( extreme_value = pm_qos_array[pm_qos_class]->comparitor(
extreme_value, node->value); extreme_value, node->value);
} }
if (atomic_read(&pm_qos_array[target]->target_value) != extreme_value) { if (atomic_read(&pm_qos_array[pm_qos_class]->target_value) !=
extreme_value) {
call_notifier = 1; call_notifier = 1;
atomic_set(&pm_qos_array[target]->target_value, extreme_value); atomic_set(&pm_qos_array[pm_qos_class]->target_value,
pr_debug(KERN_ERR "new target for qos %d is %d\n", target, extreme_value);
atomic_read(&pm_qos_array[target]->target_value)); pr_debug(KERN_ERR "new target for qos %d is %d\n", pm_qos_class,
atomic_read(&pm_qos_array[pm_qos_class]->target_value));
} }
spin_unlock_irqrestore(&pm_qos_lock, flags); spin_unlock_irqrestore(&pm_qos_lock, flags);
if (call_notifier) if (call_notifier)
blocking_notifier_call_chain(pm_qos_array[target]->notifiers, blocking_notifier_call_chain(
(unsigned long) extreme_value, NULL); pm_qos_array[pm_qos_class]->notifiers,
(unsigned long) extreme_value, NULL);
} }
static int register_pm_qos_misc(struct pm_qos_object *qos) static int register_pm_qos_misc(struct pm_qos_object *qos)
@ -185,125 +189,110 @@ static int find_pm_qos_object_by_minor(int minor)
} }
/** /**
* pm_qos_requirement - returns current system wide qos expectation * pm_qos_request - returns current system wide qos expectation
* @pm_qos_class: identification of which qos value is requested * @pm_qos_class: identification of which qos value is requested
* *
* This function returns the current target value in an atomic manner. * This function returns the current target value in an atomic manner.
*/ */
int pm_qos_requirement(int pm_qos_class) int pm_qos_request(int pm_qos_class)
{ {
return atomic_read(&pm_qos_array[pm_qos_class]->target_value); return atomic_read(&pm_qos_array[pm_qos_class]->target_value);
} }
EXPORT_SYMBOL_GPL(pm_qos_requirement); EXPORT_SYMBOL_GPL(pm_qos_request);
/** /**
* pm_qos_add_requirement - inserts new qos request into the list * pm_qos_add_request - inserts new qos request into the list
* @pm_qos_class: identifies which list of qos request to us * @pm_qos_class: identifies which list of qos request to us
* @name: identifies the request
* @value: defines the qos request * @value: defines the qos request
* *
* This function inserts a new entry in the pm_qos_class list of requested qos * This function inserts a new entry in the pm_qos_class list of requested qos
* performance characteristics. It recomputes the aggregate QoS expectations * performance characteristics. It recomputes the aggregate QoS expectations
* for the pm_qos_class of parameters. * for the pm_qos_class of parameters, and returns the pm_qos_request list
* element as a handle for use in updating and removal. Call needs to save
* this handle for later use.
*/ */
int pm_qos_add_requirement(int pm_qos_class, char *name, s32 value) struct pm_qos_request_list *pm_qos_add_request(int pm_qos_class, s32 value)
{ {
struct requirement_list *dep; struct pm_qos_request_list *dep;
unsigned long flags; unsigned long flags;
dep = kzalloc(sizeof(struct requirement_list), GFP_KERNEL); dep = kzalloc(sizeof(struct pm_qos_request_list), GFP_KERNEL);
if (dep) { if (dep) {
if (value == PM_QOS_DEFAULT_VALUE) if (value == PM_QOS_DEFAULT_VALUE)
dep->value = pm_qos_array[pm_qos_class]->default_value; dep->value = pm_qos_array[pm_qos_class]->default_value;
else else
dep->value = value; dep->value = value;
dep->name = kstrdup(name, GFP_KERNEL); dep->pm_qos_class = pm_qos_class;
if (!dep->name)
goto cleanup;
spin_lock_irqsave(&pm_qos_lock, flags); spin_lock_irqsave(&pm_qos_lock, flags);
list_add(&dep->list, list_add(&dep->list,
&pm_qos_array[pm_qos_class]->requirements.list); &pm_qos_array[pm_qos_class]->requests.list);
spin_unlock_irqrestore(&pm_qos_lock, flags); spin_unlock_irqrestore(&pm_qos_lock, flags);
update_target(pm_qos_class); update_target(pm_qos_class);
return 0;
} }
cleanup: return dep;
kfree(dep);
return -ENOMEM;
} }
EXPORT_SYMBOL_GPL(pm_qos_add_requirement); EXPORT_SYMBOL_GPL(pm_qos_add_request);
/** /**
* pm_qos_update_requirement - modifies an existing qos request * pm_qos_update_request - modifies an existing qos request
* @pm_qos_class: identifies which list of qos request to us * @pm_qos_req : handle to list element holding a pm_qos request to use
* @name: identifies the request
* @value: defines the qos request * @value: defines the qos request
* *
* Updates an existing qos requirement for the pm_qos_class of parameters along * Updates an existing qos request for the pm_qos_class of parameters along
* with updating the target pm_qos_class value. * with updating the target pm_qos_class value.
* *
* If the named request isn't in the list then no change is made. * Attempts are made to make this code callable on hot code paths.
*/ */
int pm_qos_update_requirement(int pm_qos_class, char *name, s32 new_value) void pm_qos_update_request(struct pm_qos_request_list *pm_qos_req,
s32 new_value)
{ {
unsigned long flags; unsigned long flags;
struct requirement_list *node;
int pending_update = 0; int pending_update = 0;
s32 temp;
spin_lock_irqsave(&pm_qos_lock, flags); spin_lock_irqsave(&pm_qos_lock, flags);
list_for_each_entry(node, if (new_value == PM_QOS_DEFAULT_VALUE)
&pm_qos_array[pm_qos_class]->requirements.list, list) { temp = pm_qos_array[pm_qos_req->pm_qos_class]->default_value;
if (strcmp(node->name, name) == 0) { else
if (new_value == PM_QOS_DEFAULT_VALUE) temp = new_value;
node->value =
pm_qos_array[pm_qos_class]->default_value; if (temp != pm_qos_req->value) {
else pending_update = 1;
node->value = new_value; pm_qos_req->value = temp;
pending_update = 1;
break;
}
} }
spin_unlock_irqrestore(&pm_qos_lock, flags); spin_unlock_irqrestore(&pm_qos_lock, flags);
if (pending_update) if (pending_update)
update_target(pm_qos_class); update_target(pm_qos_req->pm_qos_class);
return 0;
} }
EXPORT_SYMBOL_GPL(pm_qos_update_requirement); EXPORT_SYMBOL_GPL(pm_qos_update_request);
/** /**
* pm_qos_remove_requirement - modifies an existing qos request * pm_qos_remove_request - modifies an existing qos request
* @pm_qos_class: identifies which list of qos request to us * @pm_qos_req: handle to request list element
* @name: identifies the request
* *
* Will remove named qos request from pm_qos_class list of parameters and * Will remove pm qos request from the list of requests and
* recompute the current target value for the pm_qos_class. * recompute the current target value for the pm_qos_class. Call this
* on slow code paths.
*/ */
void pm_qos_remove_requirement(int pm_qos_class, char *name) void pm_qos_remove_request(struct pm_qos_request_list *pm_qos_req)
{ {
unsigned long flags; unsigned long flags;
struct requirement_list *node; int qos_class;
int pending_update = 0;
if (pm_qos_req == NULL)
return;
/* silent return to keep pcm code cleaner */
qos_class = pm_qos_req->pm_qos_class;
spin_lock_irqsave(&pm_qos_lock, flags); spin_lock_irqsave(&pm_qos_lock, flags);
list_for_each_entry(node, list_del(&pm_qos_req->list);
&pm_qos_array[pm_qos_class]->requirements.list, list) { kfree(pm_qos_req);
if (strcmp(node->name, name) == 0) {
kfree(node->name);
list_del(&node->list);
kfree(node);
pending_update = 1;
break;
}
}
spin_unlock_irqrestore(&pm_qos_lock, flags); spin_unlock_irqrestore(&pm_qos_lock, flags);
if (pending_update) update_target(qos_class);
update_target(pm_qos_class);
} }
EXPORT_SYMBOL_GPL(pm_qos_remove_requirement); EXPORT_SYMBOL_GPL(pm_qos_remove_request);
/** /**
* pm_qos_add_notifier - sets notification entry for changes to target value * pm_qos_add_notifier - sets notification entry for changes to target value
@ -313,7 +302,7 @@ EXPORT_SYMBOL_GPL(pm_qos_remove_requirement);
* will register the notifier into a notification chain that gets called * will register the notifier into a notification chain that gets called
* upon changes to the pm_qos_class target value. * upon changes to the pm_qos_class target value.
*/ */
int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier) int pm_qos_add_notifier(int pm_qos_class, struct notifier_block *notifier)
{ {
int retval; int retval;
@ -343,21 +332,16 @@ int pm_qos_remove_notifier(int pm_qos_class, struct notifier_block *notifier)
} }
EXPORT_SYMBOL_GPL(pm_qos_remove_notifier); EXPORT_SYMBOL_GPL(pm_qos_remove_notifier);
#define PID_NAME_LEN 32
static int pm_qos_power_open(struct inode *inode, struct file *filp) static int pm_qos_power_open(struct inode *inode, struct file *filp)
{ {
int ret;
long pm_qos_class; long pm_qos_class;
char name[PID_NAME_LEN];
pm_qos_class = find_pm_qos_object_by_minor(iminor(inode)); pm_qos_class = find_pm_qos_object_by_minor(iminor(inode));
if (pm_qos_class >= 0) { if (pm_qos_class >= 0) {
filp->private_data = (void *)pm_qos_class; filp->private_data = (void *) pm_qos_add_request(pm_qos_class,
snprintf(name, PID_NAME_LEN, "process_%d", current->pid); PM_QOS_DEFAULT_VALUE);
ret = pm_qos_add_requirement(pm_qos_class, name,
PM_QOS_DEFAULT_VALUE); if (filp->private_data)
if (ret >= 0)
return 0; return 0;
} }
return -EPERM; return -EPERM;
@ -365,32 +349,40 @@ 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 int pm_qos_power_release(struct inode *inode, struct file *filp)
{ {
int pm_qos_class; struct pm_qos_request_list *req;
char name[PID_NAME_LEN];
pm_qos_class = (long)filp->private_data; req = (struct pm_qos_request_list *)filp->private_data;
snprintf(name, PID_NAME_LEN, "process_%d", current->pid); pm_qos_remove_request(req);
pm_qos_remove_requirement(pm_qos_class, name);
return 0; return 0;
} }
static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf, static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
size_t count, loff_t *f_pos) size_t count, loff_t *f_pos)
{ {
s32 value; s32 value;
int pm_qos_class; int x;
char name[PID_NAME_LEN]; char ascii_value[11];
struct pm_qos_request_list *pm_qos_req;
pm_qos_class = (long)filp->private_data; if (count == sizeof(s32)) {
if (count != sizeof(s32)) if (copy_from_user(&value, buf, sizeof(s32)))
return -EFAULT;
} else if (count == 11) { /* len('0x12345678/0') */
if (copy_from_user(ascii_value, buf, 11))
return -EFAULT;
x = sscanf(ascii_value, "%x", &value);
if (x != 1)
return -EINVAL;
pr_debug(KERN_ERR "%s, %d, 0x%x\n", ascii_value, x, value);
} else
return -EINVAL; return -EINVAL;
if (copy_from_user(&value, buf, sizeof(s32)))
return -EFAULT;
snprintf(name, PID_NAME_LEN, "process_%d", current->pid);
pm_qos_update_requirement(pm_qos_class, name, value);
return sizeof(s32); pm_qos_req = (struct pm_qos_request_list *)filp->private_data;
pm_qos_update_request(pm_qos_req, value);
return count;
} }

2
net/mac80211/mlme.c
View File

@ -495,7 +495,7 @@ void ieee80211_recalc_ps(struct ieee80211_local *local, s32 latency)
s32 beaconint_us; s32 beaconint_us;
if (latency < 0) if (latency < 0)
latency = pm_qos_requirement(PM_QOS_NETWORK_LATENCY); latency = pm_qos_request(PM_QOS_NETWORK_LATENCY);
beaconint_us = ieee80211_tu_to_usec( beaconint_us = ieee80211_tu_to_usec(
found->vif.bss_conf.beacon_int); found->vif.bss_conf.beacon_int);

3
sound/core/pcm.c
View File

@ -648,9 +648,6 @@ int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count)
substream->number = idx; substream->number = idx;
substream->stream = stream; substream->stream = stream;
sprintf(substream->name, "subdevice #%i", idx); sprintf(substream->name, "subdevice #%i", idx);
snprintf(substream->latency_id, sizeof(substream->latency_id),
"ALSA-PCM%d-%d%c%d", pcm->card->number, pcm->device,
(stream ? 'c' : 'p'), idx);
substream->buffer_bytes_max = UINT_MAX; substream->buffer_bytes_max = UINT_MAX;
if (prev == NULL) if (prev == NULL)
pstr->substream = substream; pstr->substream = substream;

14
sound/core/pcm_native.c
View File

@ -481,11 +481,13 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
snd_pcm_timer_resolution_change(substream); snd_pcm_timer_resolution_change(substream);
runtime->status->state = SNDRV_PCM_STATE_SETUP; runtime->status->state = SNDRV_PCM_STATE_SETUP;
pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY, if (substream->latency_pm_qos_req) {
substream->latency_id); pm_qos_remove_request(substream->latency_pm_qos_req);
substream->latency_pm_qos_req = NULL;
}
if ((usecs = period_to_usecs(runtime)) >= 0) if ((usecs = period_to_usecs(runtime)) >= 0)
pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, substream->latency_pm_qos_req = pm_qos_add_request(
substream->latency_id, usecs); PM_QOS_CPU_DMA_LATENCY, usecs);
return 0; return 0;
_error: _error:
/* hardware might be unuseable from this time, /* hardware might be unuseable from this time,
@ -540,8 +542,8 @@ static int snd_pcm_hw_free(struct snd_pcm_substream *substream)
if (substream->ops->hw_free) if (substream->ops->hw_free)
result = substream->ops->hw_free(substream); result = substream->ops->hw_free(substream);
runtime->status->state = SNDRV_PCM_STATE_OPEN; runtime->status->state = SNDRV_PCM_STATE_OPEN;
pm_qos_remove_requirement(PM_QOS_CPU_DMA_LATENCY, pm_qos_remove_request(substream->latency_pm_qos_req);
substream->latency_id); substream->latency_pm_qos_req = NULL;
return result; return result;
} }