mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-21 01:51:18 +00:00
Code Issues Releases Wiki Activity

PM: QoS: Drop PM_QOS_CPU_DMA_LATENCY and rename related functions

Browse source 
Drop the PM QoS classes enum including PM_QOS_CPU_DMA_LATENCY,
drop the wrappers around pm_qos_request(), pm_qos_request_active(),
and pm_qos_add/update/remove_request() introduced previously, rename
these functions, respectively, to cpu_latency_qos_limit(),
cpu_latency_qos_request_active(), and
cpu_latency_qos_add/update/remove_request(), and update their
kerneldoc comments.  [While at it, drop some useless comments from
these functions.]

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org>
Tested-by: Amit Kucheria <amit.kucheria@linaro.org>
This commit is contained in:
Rafael J. Wysocki 2020-02-12 00:35:04 +01:00
parent 5371a79be9
commit 67b06ba018
2 changed files with 54 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
include/linux/pm_qos.h
View file

@ -9,14 +9,6 @@
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/device.h> #include <linux/device.h>
enum {
PM_QOS_RESERVED = 0,
PM_QOS_CPU_DMA_LATENCY,
/* insert new class ID */
PM_QOS_NUM_CLASSES,
};
enum pm_qos_flags_status { enum pm_qos_flags_status {
PM_QOS_FLAGS_UNDEFINED = -1, PM_QOS_FLAGS_UNDEFINED = -1,
PM_QOS_FLAGS_NONE, PM_QOS_FLAGS_NONE,
@ -144,40 +136,11 @@ bool pm_qos_update_flags(struct pm_qos_flags *pqf,
struct pm_qos_flags_request *req, struct pm_qos_flags_request *req,
enum pm_qos_req_action action, s32 val); enum pm_qos_req_action action, s32 val);
void pm_qos_add_request(struct pm_qos_request *req, int pm_qos_class, s32 cpu_latency_qos_limit(void);
s32 value); bool cpu_latency_qos_request_active(struct pm_qos_request *req);
void pm_qos_update_request(struct pm_qos_request *req, void cpu_latency_qos_add_request(struct pm_qos_request *req, s32 value);
s32 new_value); void cpu_latency_qos_update_request(struct pm_qos_request *req, s32 new_value);
void pm_qos_remove_request(struct pm_qos_request *req); void cpu_latency_qos_remove_request(struct pm_qos_request *req);
s32 pm_qos_request(int pm_qos_class);
int pm_qos_request_active(struct pm_qos_request *req);
static inline void cpu_latency_qos_add_request(struct pm_qos_request *req,
s32 value)
{
pm_qos_add_request(req, PM_QOS_CPU_DMA_LATENCY, value);
}
static inline void cpu_latency_qos_update_request(struct pm_qos_request *req,
s32 new_value)
{
pm_qos_update_request(req, new_value);
}
static inline void cpu_latency_qos_remove_request(struct pm_qos_request *req)
{
pm_qos_remove_request(req);
}
static inline bool cpu_latency_qos_request_active(struct pm_qos_request *req)
{
return pm_qos_request_active(req);
}
static inline s32 cpu_latency_qos_limit(void)
{
return pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
}
#ifdef CONFIG_PM #ifdef CONFIG_PM
enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, s32 mask); enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev, s32 mask);

98
kernel/power/qos.c
View file

@ -230,21 +230,25 @@ static struct pm_qos_constraints cpu_latency_constraints = {
}; };
/** /**
* pm_qos_request - returns current system wide qos expectation * cpu_latency_qos_limit - Return current system-wide CPU latency QoS limit.
* @pm_qos_class: Ignored.
*
* This function returns the current target value.
*/ */
s32 pm_qos_request(int pm_qos_class) s32 cpu_latency_qos_limit(void)
{ {
return pm_qos_read_value(&cpu_latency_constraints); return pm_qos_read_value(&cpu_latency_constraints);
} }
int pm_qos_request_active(struct pm_qos_request *req) /**
* cpu_latency_qos_request_active - Check the given PM QoS request.
* @req: PM QoS request to check.
*
* Return: 'true' if @req has been added to the CPU latency QoS list, 'false'
* otherwise.
*/
bool cpu_latency_qos_request_active(struct pm_qos_request *req)
{ {
return req->qos == &cpu_latency_constraints; return req->qos == &cpu_latency_constraints;
} }
EXPORT_SYMBOL_GPL(pm_qos_request_active); EXPORT_SYMBOL_GPL(cpu_latency_qos_request_active);
static void cpu_latency_qos_apply(struct pm_qos_request *req, static void cpu_latency_qos_apply(struct pm_qos_request *req,
enum pm_qos_req_action action, s32 value) enum pm_qos_req_action action, s32 value)
@ -255,25 +259,24 @@ static void cpu_latency_qos_apply(struct pm_qos_request *req,
} }
/** /**
* pm_qos_add_request - inserts new qos request into the list * cpu_latency_qos_add_request - Add new CPU latency QoS request.
* @req: pointer to a preallocated handle * @req: Pointer to a preallocated handle.
* @pm_qos_class: Ignored. * @value: Requested constraint value.
* @value: defines the qos request
* *
* This function inserts a new entry in the PM_QOS_CPU_DMA_LATENCY list of * Use @value to initialize the request handle pointed to by @req, insert it as
* requested QoS performance characteristics. It recomputes the aggregate QoS * a new entry to the CPU latency QoS list and recompute the effective QoS
* expectations for the PM_QOS_CPU_DMA_LATENCY list and initializes the @req * constraint for that list.
* handle. Caller needs to save this handle for later use in updates and *
* removal. * Callers need to save the handle for later use in updates and removal of the
* QoS request represented by it.
*/ */
void pm_qos_add_request(struct pm_qos_request *req, void cpu_latency_qos_add_request(struct pm_qos_request *req, s32 value)
int pm_qos_class, s32 value)
{ {
if (!req) /*guard against callers passing in null */ if (!req)
return; return;
if (pm_qos_request_active(req)) { if (cpu_latency_qos_request_active(req)) {
WARN(1, KERN_ERR "pm_qos_add_request() called for already added request\n"); WARN(1, KERN_ERR "%s called for already added request\n", __func__);
return; return;
} }
@ -282,25 +285,24 @@ void pm_qos_add_request(struct pm_qos_request *req,
req->qos = &cpu_latency_constraints; req->qos = &cpu_latency_constraints;
cpu_latency_qos_apply(req, PM_QOS_ADD_REQ, value); cpu_latency_qos_apply(req, PM_QOS_ADD_REQ, value);
} }
EXPORT_SYMBOL_GPL(pm_qos_add_request); EXPORT_SYMBOL_GPL(cpu_latency_qos_add_request);
/** /**
* pm_qos_update_request - modifies an existing qos request * cpu_latency_qos_update_request - Modify existing CPU latency QoS request.
* @req : handle to list element holding a pm_qos request to use * @req : QoS request to update.
* @value: defines the qos request * @new_value: New requested constraint value.
* *
* Updates an existing qos request for the PM_QOS_CPU_DMA_LATENCY list along * Use @new_value to update the QoS request represented by @req in the CPU
* with updating the target PM_QOS_CPU_DMA_LATENCY value. * latency QoS list along with updating the effective constraint value for that
* * list.
* Attempts are made to make this code callable on hot code paths.
*/ */
void pm_qos_update_request(struct pm_qos_request *req, s32 new_value) void cpu_latency_qos_update_request(struct pm_qos_request *req, s32 new_value)
{ {
if (!req) /*guard against callers passing in null */ if (!req)
return; return;
if (!pm_qos_request_active(req)) { if (!cpu_latency_qos_request_active(req)) {
WARN(1, KERN_ERR "pm_qos_update_request() called for unknown object\n"); WARN(1, KERN_ERR "%s called for unknown object\n", __func__);
return; return;
} }
@ -311,24 +313,22 @@ void pm_qos_update_request(struct pm_qos_request *req, s32 new_value)
cpu_latency_qos_apply(req, PM_QOS_UPDATE_REQ, new_value); cpu_latency_qos_apply(req, PM_QOS_UPDATE_REQ, new_value);
} }
EXPORT_SYMBOL_GPL(pm_qos_update_request); EXPORT_SYMBOL_GPL(cpu_latency_qos_update_request);
/** /**
* pm_qos_remove_request - modifies an existing qos request * cpu_latency_qos_remove_request - Remove existing CPU latency QoS request.
* @req: handle to request list element * @req: QoS request to remove.
* *
* Will remove pm qos request from the list of constraints and * Remove the CPU latency QoS request represented by @req from the CPU latency
* recompute the current target value for PM_QOS_CPU_DMA_LATENCY. Call this * QoS list along with updating the effective constraint value for that list.
* on slow code paths.
*/ */
void pm_qos_remove_request(struct pm_qos_request *req) void cpu_latency_qos_remove_request(struct pm_qos_request *req)
{ {
if (!req) /*guard against callers passing in null */ if (!req)
return; return;
/* silent return to keep pcm code cleaner */
if (!pm_qos_request_active(req)) { if (!cpu_latency_qos_request_active(req)) {
WARN(1, KERN_ERR "pm_qos_remove_request() called for unknown object\n"); WARN(1, KERN_ERR "%s called for unknown object\n", __func__);
return; return;
} }
@ -337,7 +337,7 @@ void pm_qos_remove_request(struct pm_qos_request *req)
cpu_latency_qos_apply(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE); cpu_latency_qos_apply(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE);
memset(req, 0, sizeof(*req)); memset(req, 0, sizeof(*req));
} }
EXPORT_SYMBOL_GPL(pm_qos_remove_request); EXPORT_SYMBOL_GPL(cpu_latency_qos_remove_request);
/* User space interface to the CPU latency QoS via misc device. */ /* User space interface to the CPU latency QoS via misc device. */
@ -349,7 +349,7 @@ static int cpu_latency_qos_open(struct inode *inode, struct file *filp)
if (!req) if (!req)
return -ENOMEM; return -ENOMEM;
pm_qos_add_request(req, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE); cpu_latency_qos_add_request(req, PM_QOS_DEFAULT_VALUE);
filp->private_data = req; filp->private_data = req;
return 0; return 0;
@ -361,7 +361,7 @@ static int cpu_latency_qos_release(struct inode *inode, struct file *filp)
filp->private_data = NULL; filp->private_data = NULL;
pm_qos_remove_request(req); cpu_latency_qos_remove_request(req);
kfree(req); kfree(req);
return 0; return 0;
@ -374,7 +374,7 @@ static ssize_t cpu_latency_qos_read(struct file *filp, char __user *buf,
unsigned long flags; unsigned long flags;
s32 value; s32 value;
if (!req || !pm_qos_request_active(req)) if (!req || !cpu_latency_qos_request_active(req))
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&pm_qos_lock, flags); spin_lock_irqsave(&pm_qos_lock, flags);
@ -400,7 +400,7 @@ static ssize_t cpu_latency_qos_write(struct file *filp, const char __user *buf,
return ret; return ret;
} }
pm_qos_update_request(filp->private_data, value); cpu_latency_qos_update_request(filp->private_data, value);
return count; return count;
} }