Commit 55286a29 authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Rafael J. Wysocki

OPP: Fix handling of multiple power domains

We seem to rely on the number of phandles specified in the
'required-opps' property to identify cases where a device is
associated with multiple power domains and hence would have
multiple virtual devices that have to be dealt with.

In cases where we do have devices with multiple power domains
but with only one of them being scalable, this logic seems to
fail.

Instead read the number of power domains from DT to identify
such cases.
Signed-off-by: default avatarRajendra Nayak <rnayak@codeaurora.org>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ef800684
...@@ -173,7 +173,7 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table, ...@@ -173,7 +173,7 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,
struct opp_table **required_opp_tables; struct opp_table **required_opp_tables;
struct device **genpd_virt_devs = NULL; struct device **genpd_virt_devs = NULL;
struct device_node *required_np, *np; struct device_node *required_np, *np;
int count, i; int count, count_pd, i;
/* Traversing the first OPP node is all we need */ /* Traversing the first OPP node is all we need */
np = of_get_next_available_child(opp_np, NULL); np = of_get_next_available_child(opp_np, NULL);
...@@ -186,7 +186,19 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table, ...@@ -186,7 +186,19 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,
if (!count) if (!count)
goto put_np; goto put_np;
if (count > 1) { /*
* Check the number of power-domains to know if we need to deal
* with virtual devices. In some cases we have devices with multiple
* power domains but with only one of them being scalable, hence
* 'count' could be 1, but we still have to deal with multiple genpds
* and virtual devices.
*/
count_pd = of_count_phandle_with_args(dev->of_node, "power-domains",
"#power-domain-cells");
if (!count_pd)
goto put_np;
if (count_pd > 1) {
genpd_virt_devs = kcalloc(count, sizeof(*genpd_virt_devs), genpd_virt_devs = kcalloc(count, sizeof(*genpd_virt_devs),
GFP_KERNEL); GFP_KERNEL);
if (!genpd_virt_devs) if (!genpd_virt_devs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment