Re: [PATCH V3 2/5] PM / QOS: Pass request type to dev_pm_qos_read_value()
From: Ulf Hansson
Date: Mon Jun 17 2019 - 05:29:00 EST
On Mon, 10 Jun 2019 at 12:51, Viresh Kumar <viresh.kumar@xxxxxxxxxx> wrote:
>
> In order to use dev_pm_qos_read_value(), and other internal routines to
> it, to read values for different QoS requests, pass request type as a
> parameter to these routines.
>
> For now, it only supports resume-latency request type.
>
> Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
Reviewed-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Kind regards
Uffe
> ---
> Documentation/power/pm_qos_interface.txt | 2 +-
> drivers/base/power/domain_governor.c | 4 +--
> drivers/base/power/qos.c | 10 +++---
> drivers/base/power/runtime.c | 2 +-
> drivers/cpuidle/governor.c | 2 +-
> include/linux/pm_qos.h | 41 +++++++++++++++++-------
> 6 files changed, 40 insertions(+), 21 deletions(-)
>
> diff --git a/Documentation/power/pm_qos_interface.txt b/Documentation/power/pm_qos_interface.txt
> index ec7d662d1707..cfcb1df39799 100644
> --- a/Documentation/power/pm_qos_interface.txt
> +++ b/Documentation/power/pm_qos_interface.txt
> @@ -123,7 +123,7 @@ Will remove the element. After removal it will update the aggregate target and
> call the notification trees if the target was changed as a result of removing
> the request.
>
> -s32 dev_pm_qos_read_value(device):
> +s32 dev_pm_qos_read_value(device, type):
> Returns the aggregated value for a given device's constraints list.
>
> enum pm_qos_flags_status dev_pm_qos_flags(device, mask)
> diff --git a/drivers/base/power/domain_governor.c b/drivers/base/power/domain_governor.c
> index 3838045c9277..f66ac46d07d0 100644
> --- a/drivers/base/power/domain_governor.c
> +++ b/drivers/base/power/domain_governor.c
> @@ -33,7 +33,7 @@ static int dev_update_qos_constraint(struct device *dev, void *data)
> * take its current PM QoS constraint (that's the only thing
> * known at this point anyway).
> */
> - constraint_ns = dev_pm_qos_read_value(dev);
> + constraint_ns = dev_pm_qos_read_value(dev, DEV_PM_QOS_RESUME_LATENCY);
> constraint_ns *= NSEC_PER_USEC;
> }
>
> @@ -66,7 +66,7 @@ static bool default_suspend_ok(struct device *dev)
> td->constraint_changed = false;
> td->cached_suspend_ok = false;
> td->effective_constraint_ns = 0;
> - constraint_ns = __dev_pm_qos_read_value(dev);
> + constraint_ns = __dev_pm_qos_read_value(dev, DEV_PM_QOS_RESUME_LATENCY);
>
> spin_unlock_irqrestore(&dev->power.lock, flags);
>
> diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
> index cfd463212513..7bb88174371f 100644
> --- a/drivers/base/power/qos.c
> +++ b/drivers/base/power/qos.c
> @@ -92,27 +92,29 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_flags);
> /**
> * __dev_pm_qos_read_value - Get PM QoS constraint for a given device.
> * @dev: Device to get the PM QoS constraint value for.
> + * @type: QoS request type.
> *
> * This routine must be called with dev->power.lock held.
> */
> -s32 __dev_pm_qos_read_value(struct device *dev)
> +s32 __dev_pm_qos_read_value(struct device *dev, enum dev_pm_qos_req_type type)
> {
> lockdep_assert_held(&dev->power.lock);
>
> - return dev_pm_qos_raw_read_value(dev);
> + return dev_pm_qos_raw_read_value(dev, type);
> }
>
> /**
> * dev_pm_qos_read_value - Get PM QoS constraint for a given device (locked).
> * @dev: Device to get the PM QoS constraint value for.
> + * @type: QoS request type.
> */
> -s32 dev_pm_qos_read_value(struct device *dev)
> +s32 dev_pm_qos_read_value(struct device *dev, enum dev_pm_qos_req_type type)
> {
> unsigned long flags;
> s32 ret;
>
> spin_lock_irqsave(&dev->power.lock, flags);
> - ret = __dev_pm_qos_read_value(dev);
> + ret = __dev_pm_qos_read_value(dev, type);
> spin_unlock_irqrestore(&dev->power.lock, flags);
>
> return ret;
> diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
> index 952a1e7057c7..92ffc2a0151d 100644
> --- a/drivers/base/power/runtime.c
> +++ b/drivers/base/power/runtime.c
> @@ -275,7 +275,7 @@ static int rpm_check_suspend_allowed(struct device *dev)
> || (dev->power.request_pending
> && dev->power.request == RPM_REQ_RESUME))
> retval = -EAGAIN;
> - else if (__dev_pm_qos_read_value(dev) == 0)
> + else if (__dev_pm_qos_read_value(dev, DEV_PM_QOS_RESUME_LATENCY) == 0)
> retval = -EPERM;
> else if (dev->power.runtime_status == RPM_SUSPENDED)
> retval = 1;
> diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
> index 9fddf828a76f..fb5659eb2009 100644
> --- a/drivers/cpuidle/governor.c
> +++ b/drivers/cpuidle/governor.c
> @@ -110,7 +110,7 @@ int cpuidle_governor_latency_req(unsigned int cpu)
> {
> int global_req = pm_qos_request(PM_QOS_CPU_DMA_LATENCY);
> struct device *device = get_cpu_device(cpu);
> - int device_req = dev_pm_qos_raw_read_value(device);
> + int device_req = dev_pm_qos_raw_read_value(device, DEV_PM_QOS_RESUME_LATENCY);
>
> return device_req < global_req ? device_req : global_req;
> }
> diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
> index 1f4d456e8fff..55814d48c39c 100644
> --- a/include/linux/pm_qos.h
> +++ b/include/linux/pm_qos.h
> @@ -139,8 +139,8 @@ s32 pm_qos_read_value(struct pm_qos_constraints *c);
> #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);
> -s32 __dev_pm_qos_read_value(struct device *dev);
> -s32 dev_pm_qos_read_value(struct device *dev);
> +s32 __dev_pm_qos_read_value(struct device *dev, enum dev_pm_qos_req_type type);
> +s32 dev_pm_qos_read_value(struct device *dev, enum dev_pm_qos_req_type type);
> int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req,
> enum dev_pm_qos_req_type type, s32 value);
> int dev_pm_qos_update_request(struct dev_pm_qos_request *req, s32 new_value);
> @@ -176,11 +176,19 @@ static inline s32 dev_pm_qos_requested_flags(struct device *dev)
> return dev->power.qos->flags_req->data.flr.flags;
> }
>
> -static inline s32 dev_pm_qos_raw_read_value(struct device *dev)
> +static inline s32 dev_pm_qos_raw_read_value(struct device *dev,
> + enum dev_pm_qos_req_type type)
> {
> - return IS_ERR_OR_NULL(dev->power.qos) ?
> - PM_QOS_RESUME_LATENCY_NO_CONSTRAINT :
> - pm_qos_read_value(&dev->power.qos->resume_latency);
> + struct dev_pm_qos *qos = dev->power.qos;
> +
> + switch (type) {
> + case DEV_PM_QOS_RESUME_LATENCY:
> + return IS_ERR_OR_NULL(qos) ? PM_QOS_RESUME_LATENCY_NO_CONSTRAINT
> + : pm_qos_read_value(&qos->resume_latency);
> + default:
> + WARN_ON(1);
> + return 0;
> + }
> }
> #else
> static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,
> @@ -189,10 +197,6 @@ static inline enum pm_qos_flags_status __dev_pm_qos_flags(struct device *dev,
> static inline enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev,
> s32 mask)
> { return PM_QOS_FLAGS_UNDEFINED; }
> -static inline s32 __dev_pm_qos_read_value(struct device *dev)
> - { return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; }
> -static inline s32 dev_pm_qos_read_value(struct device *dev)
> - { return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT; }
> static inline int dev_pm_qos_add_request(struct device *dev,
> struct dev_pm_qos_request *req,
> enum dev_pm_qos_req_type type,
> @@ -245,10 +249,23 @@ static inline s32 dev_pm_qos_requested_resume_latency(struct device *dev)
> return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
> }
> static inline s32 dev_pm_qos_requested_flags(struct device *dev) { return 0; }
> -static inline s32 dev_pm_qos_raw_read_value(struct device *dev)
> +
> +static inline s32 dev_pm_qos_raw_read_value(struct device *dev,
> + enum dev_pm_qos_req_type type)
> {
> - return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
> + switch type {
> + case DEV_PM_QOS_RESUME_LATENCY:
> + return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
> + default:
> + WARN_ON(1);
> + return 0;
> + }
> }
> +
> +static inline s32 __dev_pm_qos_read_value(struct device *dev, enum dev_pm_qos_req_type type)
> + { return dev_pm_qos_raw_read_value(dev, type); }
> +static inline s32 dev_pm_qos_read_value(struct device *dev, enum dev_pm_qos_req_type type)
> + { return dev_pm_qos_raw_read_value(dev, type); }
> #endif
>
> #endif
> --
> 2.21.0.rc0.269.g1a574e7a288b
>