[PATCH v3 1/2] PM / Domains: Allow no domain-idle-states DT property in genpd when parsing
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.
Reported-by: Benjamin Gaignard benjamin.gaignard@st.com Fixes: 2c361684803e ("PM / Domains: Don't treat zero found compatible idle states as an error") Cc: stable@vger.kernel.org Reviewed-by: Sudeep Holla sudeep.holla@arm.com Signed-off-by: Ulf Hansson ulf.hansson@linaro.org ---
Changes in v3: - Resending with reviewed-tags added.
--- drivers/base/power/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 959d6d5eb000..0a01df608849 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2653,7 +2653,7 @@ static int genpd_iterate_idle_states(struct device_node *dn,
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) {
On Tuesday, March 10, 2020 11:40:23 AM CET Ulf Hansson wrote:
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.
Reported-by: Benjamin Gaignard benjamin.gaignard@st.com Fixes: 2c361684803e ("PM / Domains: Don't treat zero found compatible idle states as an error") Cc: stable@vger.kernel.org Reviewed-by: Sudeep Holla sudeep.holla@arm.com Signed-off-by: Ulf Hansson ulf.hansson@linaro.org
Changes in v3:
- Resending with reviewed-tags added.
drivers/base/power/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 959d6d5eb000..0a01df608849 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -2653,7 +2653,7 @@ static int genpd_iterate_idle_states(struct device_node *dn, 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) {
Applied as 5.7 material along with the [2/2], thanks!
linux-stable-mirror@lists.linaro.org
-
Rafael J. Wysocki -
Ulf Hansson