lkml.org 
[lkml]   [2020]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 116/232] PM / Domains: Allow no domain-idle-states DT property in genpd when parsing
    Date
    From: Ulf Hansson <ulf.hansson@linaro.org>

    commit 56cb26891ea4180121265dc6b596015772c4a4b8 upstream.

    Commit 2c361684803e ("PM / Domains: Don't treat zero found compatible idle
    states as an error"), moved of_genpd_parse_idle_states() towards allowing
    none compatible idle state to be found for the device node, rather than
    returning an error code.

    However, it didn't consider that the "domain-idle-states" DT property may
    be missing as it's optional, which makes of_count_phandle_with_args() to
    return -ENOENT. Let's fix this to make the behaviour consistent.

    Fixes: 2c361684803e ("PM / Domains: Don't treat zero found compatible idle states as an error")
    Reported-by: Benjamin Gaignard <benjamin.gaignard@st.com>
    Cc: 4.20+ <stable@vger.kernel.org> # 4.20+
    Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/base/power/domain.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/base/power/domain.c
    +++ b/drivers/base/power/domain.c
    @@ -2615,7 +2615,7 @@ static int genpd_iterate_idle_states(str

    ret = of_count_phandle_with_args(dn, "domain-idle-states", NULL);
    if (ret <= 0)
    - return ret;
    + return ret == -ENOENT ? 0 : ret;

    /* Loop over the phandles until all the requested entry is found */
    of_for_each_phandle(&it, ret, dn, "domain-idle-states", NULL, 0) {

    \
     
     \ /
      Last update: 2020-04-16 17:21    [W:9.065 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site