Commit 34be2751 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

cpuidle: psci: Fix regression leading to no genpd governor 



While factoring out the PM domain related code from PSCI domain driver into
a set of library functions, a regression when initializing the genpds got
introduced. More precisely, we fail to assign a genpd governor, so let's
fix this.

Fixes: 9d976d67 ("cpuidle: Factor-out power domain related code from PSCI domain driver")
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent d1cf8bbf

drivers/cpuidle/cpuidle-psci-domain.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int psci_pd_init(struct device_node *np, bool use_osi) 
	struct generic_pm_domain *pd;

	struct psci_pd_provider *pd_provider;

	struct dev_power_governor *pd_gov;

	int ret = -ENOMEM, state_count = 0;

	int ret = -ENOMEM;



	pd = dt_idle_pd_alloc(np, psci_dt_parse_state_node);

	if (!pd)
@@ -71,7 +71,7 @@ static int psci_pd_init(struct device_node *np, bool use_osi) 
		pd->flags |= GENPD_FLAG_ALWAYS_ON;



	/* Use governor for CPU PM domains if it has some states to manage. */

	pd_gov = state_count > 0 ? &pm_domain_cpu_gov : NULL;

	pd_gov = pd->states ? &pm_domain_cpu_gov : NULL;



	ret = pm_genpd_init(pd, pd_gov, false);

	if (ret)