On Thu, Oct 17, 2019 at 11:41 AM Viresh Kumar <viresh.kumar@xxxxxxxxxx> wrote: > > On 16-10-19, 12:41, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > > > > Introduce frequency QoS, based on the "raw" low-level PM QoS, to > > represent min and max frequency requests and aggregate constraints. > > > > The min and max frequency requests are to be represented by > > struct freq_qos_request objects and the aggregate constraints are to > > be represented by struct freq_constraints objects. The latter are > > expected to be initialized with the help of freq_constraints_init(). > > > > The freq_qos_read_value() helper is defined to retrieve the aggregate > > constraints values from a given struct freq_constraints object and > > there are the freq_qos_add_request(), freq_qos_update_request() and > > freq_qos_remove_request() helpers to manipulate the min and max > > frequency requests. It is assumed that the the helpers will not > > run concurrently with each other for the same struct freq_qos_request > > object, so if that may be the case, their uses must ensure proper > > synchronization between them (e.g. through locking). > > > > In addition, freq_qos_add_notifier() and freq_qos_remove_notifier() > > are provided to add and remove notifiers that will trigger on aggregate > > constraint changes to and from a given struct freq_constraints object, > > respectively. > > > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> > > --- > > include/linux/pm_qos.h | 44 ++++++++ > > kernel/power/qos.c | 240 +++++++++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 284 insertions(+) > > > > Index: linux-pm/include/linux/pm_qos.h > > =================================================================== > > --- linux-pm.orig/include/linux/pm_qos.h > > +++ linux-pm/include/linux/pm_qos.h > > @@ -267,4 +267,48 @@ static inline s32 dev_pm_qos_raw_resume_ > > } > > #endif > > > > +#define FREQ_QOS_MIN_DEFAULT_VALUE 0 > > +#define FREQ_QOS_MAX_DEFAULT_VALUE (-1) > > + > > +enum freq_qos_req_type { > > + FREQ_QOS_MIN = 1, > > + FREQ_QOS_MAX, > > +}; > > + > > +struct freq_constraints { > > + struct pm_qos_constraints min_freq; > > + struct blocking_notifier_head min_freq_notifiers; > > + struct pm_qos_constraints max_freq; > > + struct blocking_notifier_head max_freq_notifiers; > > +}; > > + > > +struct freq_qos_request { > > + enum freq_qos_req_type type; > > + struct plist_node pnode; > > + struct freq_constraints *qos; > > +}; > > + > > +static inline int freq_qos_request_active(struct freq_qos_request *req) > > +{ > > + return !IS_ERR_OR_NULL(req->qos); > > +} > > + > > +void freq_constraints_init(struct freq_constraints *qos); > > + > > +s32 freq_qos_read_value(struct freq_constraints *qos, > > + enum freq_qos_req_type type); > > + > > +int freq_qos_add_request(struct freq_constraints *qos, > > + struct freq_qos_request *req, > > + enum freq_qos_req_type type, s32 value); > > +int freq_qos_update_request(struct freq_qos_request *req, s32 new_value); > > +int freq_qos_remove_request(struct freq_qos_request *req); > > + > > +int freq_qos_add_notifier(struct freq_constraints *qos, > > + enum freq_qos_req_type type, > > + struct notifier_block *notifier); > > +int freq_qos_remove_notifier(struct freq_constraints *qos, > > + enum freq_qos_req_type type, > > + struct notifier_block *notifier); > > + > > #endif > > Index: linux-pm/kernel/power/qos.c > > =================================================================== > > --- linux-pm.orig/kernel/power/qos.c > > +++ linux-pm/kernel/power/qos.c > > @@ -650,3 +650,243 @@ static int __init pm_qos_power_init(void > > } > > > > late_initcall(pm_qos_power_init); > > + > > +/* Definitions related to the frequency QoS below. */ > > + > > +/** > > + * freq_constraints_init - Initialize frequency QoS constraints. > > + * @qos: Frequency QoS constraints to initialize. > > + */ > > +void freq_constraints_init(struct freq_constraints *qos) > > +{ > > + struct pm_qos_constraints *c; > > + > > + c = &qos->min_freq; > > + plist_head_init(&c->list); > > + c->target_value = FREQ_QOS_MIN_DEFAULT_VALUE; > > + c->default_value = FREQ_QOS_MIN_DEFAULT_VALUE; > > + c->no_constraint_value = FREQ_QOS_MIN_DEFAULT_VALUE; > > + c->type = PM_QOS_MAX; > > should this be MIN ? No, it shouldn't. For the min frequency, the effective constraint needs to be the maximum of all requests, because that satisfies all of them (each request means "the frequency cannot be less than this"). > > + c->notifiers = &qos->min_freq_notifiers; > > + BLOCKING_INIT_NOTIFIER_HEAD(c->notifiers); > > + > > + c = &qos->max_freq; > > + plist_head_init(&c->list); > > + c->target_value = FREQ_QOS_MAX_DEFAULT_VALUE; > > + c->default_value = FREQ_QOS_MAX_DEFAULT_VALUE; > > + c->no_constraint_value = FREQ_QOS_MAX_DEFAULT_VALUE; > > + c->type = PM_QOS_MIN; > > and this MAX ? Likewise, for the max frequency, the effective constraint needs to be the minimum of all requests, as each of them means "the frequency cannot be more than this"). [Also note that the current code in device PM QoS uses MIN and MAX here in the same way. :-)]