lkml.org 
[lkml]   [2017]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/6] PM / QOS: Pass request type to dev_pm_qos_{add|remove}_notifier()
    Date
    In order to use the same set of routines to register notifiers for
    different request types, update the existing
    dev_pm_qos_{add|remove}_notifier() routines with an additional
    parameter: request-type.

    For now, it only supports resume-latency request type.

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    ---
    Documentation/power/pm_qos_interface.txt | 11 +++++++----
    drivers/base/power/domain.c | 8 +++++---
    drivers/base/power/qos.c | 14 ++++++++++++--
    include/linux/pm_qos.h | 12 ++++++++----
    4 files changed, 32 insertions(+), 13 deletions(-)

    diff --git a/Documentation/power/pm_qos_interface.txt b/Documentation/power/pm_qos_interface.txt
    index 129f7c0e1483..c7989d140428 100644
    --- a/Documentation/power/pm_qos_interface.txt
    +++ b/Documentation/power/pm_qos_interface.txt
    @@ -166,12 +166,15 @@ under the device's power directory.
    The per-device PM QoS framework has 2 different and distinct notification trees:
    a per-device notification tree and a global notification tree.

    -int dev_pm_qos_add_notifier(device, notifier):
    -Adds a notification callback function for the device.
    +int dev_pm_qos_add_notifier(device, notifier, type):
    +Adds a notification callback function for the device for a particular request
    +type.
    +
    The callback is called when the aggregated value of the device constraints list
    -is changed (for resume latency device PM QoS only).
    +is changed. Currently it only supports the notifier to be registered for resume
    +latency device PM QoS.

    -int dev_pm_qos_remove_notifier(device, notifier):
    +int dev_pm_qos_remove_notifier(device, notifier, type):
    Removes the notification callback function for the device.

    int dev_pm_qos_add_global_notifier(notifier):
    diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
    index 2997026b4dfb..12f16d9b6b55 100644
    --- a/drivers/base/power/domain.c
    +++ b/drivers/base/power/domain.c
    @@ -1203,7 +1203,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
    if (ret)
    genpd_free_dev_data(dev, gpd_data);
    else
    - dev_pm_qos_add_notifier(dev, &gpd_data->nb);
    + dev_pm_qos_add_notifier(dev, &gpd_data->nb,
    + DEV_PM_QOS_RESUME_LATENCY);

    return ret;
    }
    @@ -1238,7 +1239,8 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,

    pdd = dev->power.subsys_data->domain_data;
    gpd_data = to_gpd_data(pdd);
    - dev_pm_qos_remove_notifier(dev, &gpd_data->nb);
    + dev_pm_qos_remove_notifier(dev, &gpd_data->nb,
    + DEV_PM_QOS_RESUME_LATENCY);

    genpd_lock(genpd);

    @@ -1263,7 +1265,7 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,

    out:
    genpd_unlock(genpd);
    - dev_pm_qos_add_notifier(dev, &gpd_data->nb);
    + dev_pm_qos_add_notifier(dev, &gpd_data->nb, DEV_PM_QOS_RESUME_LATENCY);

    return ret;
    }
    diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
    index 01f615b18055..9adc208cf1fc 100644
    --- a/drivers/base/power/qos.c
    +++ b/drivers/base/power/qos.c
    @@ -481,6 +481,7 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_remove_request);
    *
    * @dev: target device for the constraint
    * @notifier: notifier block managed by caller.
    + * @type: request type.
    *
    * Will register the notifier into a notification chain that gets called
    * upon changes to the target value for the device.
    @@ -488,10 +489,14 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_remove_request);
    * If the device's constraints object doesn't exist when this routine is called,
    * it will be created (or error code will be returned if that fails).
    */
    -int dev_pm_qos_add_notifier(struct device *dev, struct notifier_block *notifier)
    +int dev_pm_qos_add_notifier(struct device *dev, struct notifier_block *notifier,
    + enum dev_pm_qos_req_type type)
    {
    int ret = 0;

    + if (WARN_ON(type != DEV_PM_QOS_RESUME_LATENCY))
    + return -EINVAL;
    +
    mutex_lock(&dev_pm_qos_mtx);

    if (IS_ERR(dev->power.qos))
    @@ -514,15 +519,20 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_add_notifier);
    *
    * @dev: target device for the constraint
    * @notifier: notifier block to be removed.
    + * @type: request type.
    *
    * Will remove the notifier from the notification chain that gets called
    * upon changes to the target value.
    */
    int dev_pm_qos_remove_notifier(struct device *dev,
    - struct notifier_block *notifier)
    + struct notifier_block *notifier,
    + enum dev_pm_qos_req_type type)
    {
    int retval = 0;

    + if (WARN_ON(type != DEV_PM_QOS_RESUME_LATENCY))
    + return -EINVAL;
    +
    mutex_lock(&dev_pm_qos_mtx);

    /* Silently return if the constraints object is not present. */
    diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
    index 0f65d36c2a75..3b24f7d20299 100644
    --- a/include/linux/pm_qos.h
    +++ b/include/linux/pm_qos.h
    @@ -144,9 +144,11 @@ int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req,
    int dev_pm_qos_update_request(struct dev_pm_qos_request *req, s32 new_value);
    int dev_pm_qos_remove_request(struct dev_pm_qos_request *req);
    int dev_pm_qos_add_notifier(struct device *dev,
    - struct notifier_block *notifier);
    + struct notifier_block *notifier,
    + enum dev_pm_qos_req_type type);
    int dev_pm_qos_remove_notifier(struct device *dev,
    - struct notifier_block *notifier);
    + struct notifier_block *notifier,
    + enum dev_pm_qos_req_type type);
    int dev_pm_qos_add_global_notifier(struct notifier_block *notifier);
    int dev_pm_qos_remove_global_notifier(struct notifier_block *notifier);
    void dev_pm_qos_constraints_init(struct device *dev);
    @@ -195,10 +197,12 @@ static inline int dev_pm_qos_update_request(struct dev_pm_qos_request *req,
    static inline int dev_pm_qos_remove_request(struct dev_pm_qos_request *req)
    { return 0; }
    static inline int dev_pm_qos_add_notifier(struct device *dev,
    - struct notifier_block *notifier)
    + struct notifier_block *notifier,
    + enum dev_pm_qos_req_type type);
    { return 0; }
    static inline int dev_pm_qos_remove_notifier(struct device *dev,
    - struct notifier_block *notifier)
    + struct notifier_block *notifier,
    + enum dev_pm_qos_req_type type)
    { return 0; }
    static inline int dev_pm_qos_add_global_notifier(
    struct notifier_block *notifier)
    --
    2.7.1.410.g6faf27b
    \
     
     \ /
      Last update: 2017-01-03 12:08    [W:2.600 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site