Skip to content

Commit

Permalink
PM / QoS: Handle device PM QoS flags while removing constraints
Browse files Browse the repository at this point in the history
PM QoS flags have to be handled by dev_pm_qos_constraints_destroy()
in the same way as PM QoS resume latency constraints.  That is, if
they have been exposed to user space, they have to be hidden from it
and the list of flags requests has to be flushed before destroying
the device's PM QoS object.  Make that happen.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Rafael J. Wysocki committed Nov 24, 2012
1 parent 7e4d684 commit 35546bd
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions drivers/base/power/qos.c
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,14 @@ void dev_pm_qos_constraints_destroy(struct device *dev)
struct dev_pm_qos *qos;
struct dev_pm_qos_request *req, *tmp;
struct pm_qos_constraints *c;
struct pm_qos_flags *f;

/*
* If the device's PM QoS resume latency limit has been exposed to user
* space, it has to be hidden at this point.
* If the device's PM QoS resume latency limit or PM QoS flags have been
* exposed to user space, they have to be hidden at this point.
*/
dev_pm_qos_hide_latency_limit(dev);
dev_pm_qos_hide_flags(dev);

mutex_lock(&dev_pm_qos_mtx);

Expand All @@ -237,8 +239,8 @@ void dev_pm_qos_constraints_destroy(struct device *dev)
if (!qos)
goto out;

/* Flush the constraints lists for the device. */
c = &qos->latency;
/* Flush the constraints list for the device */
plist_for_each_entry_safe(req, tmp, &c->list, data.pnode) {
/*
* Update constraints list and call the notification
Expand All @@ -247,6 +249,11 @@ void dev_pm_qos_constraints_destroy(struct device *dev)
apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE);
memset(req, 0, sizeof(*req));
}
f = &qos->flags;
list_for_each_entry_safe(req, tmp, &f->list, data.flr.node) {
apply_constraint(req, PM_QOS_REMOVE_REQ, PM_QOS_DEFAULT_VALUE);
memset(req, 0, sizeof(*req));
}

spin_lock_irq(&dev->power.lock);
dev->power.qos = NULL;
Expand Down

0 comments on commit 35546bd

Please sign in to comment.