lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 499/879] cpuidle: psci: Fix regression leading to no genpd governor
    Date
    From: Ulf Hansson <ulf.hansson@linaro.org>

    [ Upstream commit 34be27517cb763ea367da21e3cdee5d1bc40f47f ]

    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: 9d976d6721df ("cpuidle: Factor-out power domain related code from PSCI domain driver")
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Reviewed-by: Anup Patel <anup@brainfault.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/cpuidle/cpuidle-psci-domain.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/cpuidle/cpuidle-psci-domain.c b/drivers/cpuidle/cpuidle-psci-domain.c
    index 755bbdfc5b82..3db4fca1172b 100644
    --- a/drivers/cpuidle/cpuidle-psci-domain.c
    +++ b/drivers/cpuidle/cpuidle-psci-domain.c
    @@ -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)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 02:23    [W:4.103 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site