Skip to content

Commit

Permalink
OPP: don't drop performance constraint on OPP table removal
Browse files Browse the repository at this point in the history
This code was added (long back) by commit 009acd1 ("PM / OPP:
Support updating performance state of device's power domain") and at
that time the `opp->pstate` field was used to store the performance
state required by a device's OPP.

Over time that changed and the `->pstate` field is now used only for
genpd devices and consumer devices access that via the required-opps
instead.

Because of all these changes, _opp_table_kref_release() now drops the
constraint only when the genpd's OPP table gets freed and not the
device's. Which is definitely not what we wanted. And dropping the
constraint doesn't have much meaning as the genpd itself is going away.

Moreover, if we want to drop constraints here, then just dropping the
performance constraint alone isn't sufficient as there are other
resource constraints like clk, regulator, etc. too, which must be
handled.

Probably the right thing to do here is to leave this decision to the
consumers, which can call `dev_pm_opp_set_rate(dev, 0)` or similar APIs
to drop all constraints properly. Which many of the consumers already
do.

Remove the special code, which is broken anyway.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
vireshk committed Jun 14, 2023
1 parent 64aaeb7 commit 04bd2ea
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
10 changes: 1 addition & 9 deletions drivers/opp/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1522,16 +1522,8 @@ static void _opp_table_kref_release(struct kref *kref)

WARN_ON(!list_empty(&opp_table->opp_list));

list_for_each_entry_safe(opp_dev, temp, &opp_table->dev_list, node) {
/*
* The OPP table is getting removed, drop the performance state
* constraints.
*/
if (opp_table->genpd_performance_state)
dev_pm_genpd_set_performance_state((struct device *)(opp_dev->dev), 0);

list_for_each_entry_safe(opp_dev, temp, &opp_table->dev_list, node)
_remove_opp_dev(opp_dev, opp_table);
}

mutex_destroy(&opp_table->genpd_virt_dev_lock);
mutex_destroy(&opp_table->lock);
Expand Down
8 changes: 0 additions & 8 deletions drivers/opp/of.c
Original file line number Diff line number Diff line change
Expand Up @@ -1034,14 +1034,6 @@ static int _of_add_opp_table_v2(struct device *dev, struct opp_table *opp_table)
goto remove_static_opp;
}

list_for_each_entry(opp, &opp_table->opp_list, node) {
/* Any non-zero performance state would enable the feature */
if (opp->pstate) {
opp_table->genpd_performance_state = true;
break;
}
}

lazy_link_required_opp_table(opp_table);

return 0;
Expand Down
2 changes: 0 additions & 2 deletions drivers/opp/opp.h
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ enum opp_table_access {
* @paths: Interconnect path handles
* @path_count: Number of interconnect paths
* @enabled: Set to true if the device's resources are enabled/configured.
* @genpd_performance_state: Device's power domain support performance state.
* @is_genpd: Marks if the OPP table belongs to a genpd.
* @set_required_opps: Helper responsible to set required OPPs.
* @dentry: debugfs dentry pointer of the real device directory (not links).
Expand Down Expand Up @@ -233,7 +232,6 @@ struct opp_table {
struct icc_path **paths;
unsigned int path_count;
bool enabled;
bool genpd_performance_state;
bool is_genpd;
int (*set_required_opps)(struct device *dev,
struct opp_table *opp_table, struct dev_pm_opp *opp, bool scaling_down);
Expand Down

0 comments on commit 04bd2ea

Please sign in to comment.