PM / QOS: Pass request type to dev_pm_qos_read_value()

In order to allow dev_pm_qos_read_value() 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 but will be
extended to frequency limit (min/max) constraints later on.

Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/Documentation/power/pm_qos_interface.txt b/Documentation/power/pm_qos_interface.txt
index ec7d662d1707667b1adcf2663ce69294f4702a83..cfcb1df3979921b32d3de12a05793dac80754caa 100644 (file)
--- 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 20e56a5be01f63eeca7e3602e1adc6c43aabb223..daa8c7689f7e6251052c0742cc943c6ece64a3e0 100644 (file)
--- 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;
        }
 

diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 7a0d197f0809912f3481b63587ee606650c72f02..2461fed0efa06dcd816429250b4e381bcb0a1759 100644 (file)
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -105,18 +105,25 @@ s32 __dev_pm_qos_resume_latency(struct device *dev)
 /**
  * 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)
 {
+       struct dev_pm_qos *qos = dev->power.qos;
        unsigned long flags;
        s32 ret;
 
        spin_lock_irqsave(&dev->power.lock, flags);
 
-       if (IS_ERR_OR_NULL(dev->power.qos))
-               ret = PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
-       else
-               ret = pm_qos_read_value(&dev->power.qos->resume_latency);
+       switch (type) {
+       case DEV_PM_QOS_RESUME_LATENCY:
+               ret = IS_ERR_OR_NULL(qos) ? PM_QOS_RESUME_LATENCY_NO_CONSTRAINT
+                       : pm_qos_read_value(&qos->resume_latency);
+               break;
+       default:
+               WARN_ON(1);
+               ret = 0;
+       }
 
        spin_unlock_irqrestore(&dev->power.lock, flags);
 

diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index 5e09d4980786bab7e12a7dbecaf041c33e0b0826..9a21b7ba72ae2e1e73a6564eac33d12ea0e02dd6 100644 (file)
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -140,7 +140,7 @@ s32 pm_qos_read_value(struct pm_qos_constraints *c);
 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_resume_latency(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);
 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);
@@ -191,8 +191,18 @@ static inline enum pm_qos_flags_status dev_pm_qos_flags(struct device *dev,
                        { return PM_QOS_FLAGS_UNDEFINED; }
 static inline s32 __dev_pm_qos_resume_latency(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 s32 dev_pm_qos_read_value(struct device *dev,
+                                       enum dev_pm_qos_req_type type)
+{
+       switch (type) {
+       case DEV_PM_QOS_RESUME_LATENCY:
+               return PM_QOS_RESUME_LATENCY_NO_CONSTRAINT;
+       default:
+               WARN_ON(1);
+               return 0;
+       }
+}
+
 static inline int dev_pm_qos_add_request(struct device *dev,
                                         struct dev_pm_qos_request *req,
                                         enum dev_pm_qos_req_type type,