renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 14:43:58 +08:00
Code

Merge branch 'pm-opp'

Browse Source 
* pm-opp:
  opp: Allow required-opps to be used for non genpd use cases
  opp: use list_del_init instead of list_del/INIT_LIST_HEAD
This commit is contained in:
Rafael J. Wysocki 2021-06-29 15:52:13 +02:00
commit fff3df4bac
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/opp/core.c
View File

@ -893,6 +893,16 @@ static int _set_required_opps(struct device *dev,
if (!required_opp_tables) if (!required_opp_tables)
return 0; return 0;
/*
* We only support genpd's OPPs in the "required-opps" for now, as we
* don't know much about other use cases. Error out if the required OPP
* doesn't belong to a genpd.
*/
if (unlikely(!required_opp_tables[0]->is_genpd)) {
dev_err(dev, "required-opps don't belong to a genpd\n");
return -ENOENT;
}
/* required-opps not fully initialized yet */ /* required-opps not fully initialized yet */
if (lazy_linking_pending(opp_table)) if (lazy_linking_pending(opp_table))
return -EBUSY; return -EBUSY;

27
drivers/opp/of.c
View File

@ -197,21 +197,8 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,
required_opp_tables[i] = _find_table_of_opp_np(required_np); required_opp_tables[i] = _find_table_of_opp_np(required_np);
of_node_put(required_np); of_node_put(required_np);
if (IS_ERR(required_opp_tables[i])) { if (IS_ERR(required_opp_tables[i]))
lazy = true; lazy = true;
continue;
}
/*
* We only support genpd's OPPs in the "required-opps" for now,
* as we don't know how much about other cases. Error out if the
* required OPP doesn't belong to a genpd.
*/
if (!required_opp_tables[i]->is_genpd) {
dev_err(dev, "required-opp doesn't belong to genpd: %pOF\n",
required_np);
goto free_required_tables;
}
} }
/* Let's do the linking later on */ /* Let's do the linking later on */
@ -379,13 +366,6 @@ static void lazy_link_required_opp_table(struct opp_table *new_table)
struct dev_pm_opp *opp; struct dev_pm_opp *opp;
int i, ret; int i, ret;
/*
* We only support genpd's OPPs in the "required-opps" for now,
* as we don't know much about other cases.
*/
if (!new_table->is_genpd)
return;
mutex_lock(&opp_table_lock); mutex_lock(&opp_table_lock);
list_for_each_entry_safe(opp_table, temp, &lazy_opp_tables, lazy) { list_for_each_entry_safe(opp_table, temp, &lazy_opp_tables, lazy) {
@ -433,8 +413,7 @@ static void lazy_link_required_opp_table(struct opp_table *new_table)
/* All required opp-tables found, remove from lazy list */ /* All required opp-tables found, remove from lazy list */
if (!lazy) { if (!lazy) {
list_del(&opp_table->lazy); list_del_init(&opp_table->lazy);
INIT_LIST_HEAD(&opp_table->lazy);
list_for_each_entry(opp, &opp_table->opp_list, node) list_for_each_entry(opp, &opp_table->opp_list, node)
_required_opps_available(opp, opp_table->required_opp_count); _required_opps_available(opp, opp_table->required_opp_count);
@ -874,7 +853,7 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table,
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
ret = _read_opp_key(new_opp, opp_table, np, &rate_not_available); ret = _read_opp_key(new_opp, opp_table, np, &rate_not_available);
if (ret < 0 && !opp_table->is_genpd) { if (ret < 0) {
dev_err(dev, "%s: opp key field not found\n", __func__); dev_err(dev, "%s: opp key field not found\n", __func__);
goto free_opp; goto free_opp;
} }