From: Ulf Hansson <ulf.hansson@linaro.org>
To: Sudeep Holla <sudeep.holla@arm.com>,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Rob Herring <robh+dt@kernel.org>,
linux-pm@vger.kernel.org
Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
Lina Iyer <ilina@codeaurora.org>,
Vincent Guittot <vincent.guittot@linaro.org>,
Stephen Boyd <sboyd@kernel.org>, Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Kevin Hilman <khilman@kernel.org>,
Ulf Hansson <ulf.hansson@linaro.org>,
linux-arm-kernel@lists.infradead.org,
linux-arm-msm@vger.kernel.org
Subject: [PATCH v3 06/13] cpuidle: psci: Simplify OF parsing of CPU idle state nodes
Date: Wed, 27 Nov 2019 11:29:07 +0100 [thread overview]
Message-ID: <20191127102914.18729-7-ulf.hansson@linaro.org> (raw)
In-Reply-To: <20191127102914.18729-1-ulf.hansson@linaro.org>
Iterating through the idle state nodes in DT, to find out the number of
states that needs to be allocated is unnecessary, as it has already been
done from dt_init_idle_driver(). Therefore, drop the iteration and use the
number we already have at hand.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
---
Changes in v3:
- None.
---
drivers/cpuidle/cpuidle-psci.c | 35 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/drivers/cpuidle/cpuidle-psci.c b/drivers/cpuidle/cpuidle-psci.c
index 361985f52ddd..761359be50f2 100644
--- a/drivers/cpuidle/cpuidle-psci.c
+++ b/drivers/cpuidle/cpuidle-psci.c
@@ -73,30 +73,24 @@ static int __init psci_dt_parse_state_node(struct device_node *np, u32 *state)
return 0;
}
-static int __init psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu)
+static int __init psci_dt_cpu_init_idle(struct device_node *cpu_node,
+ unsigned int state_count, int cpu)
{
- int i, ret = 0, count = 0;
+ int i, ret = 0;
u32 *psci_states;
struct device_node *state_node;
- /* Count idle states */
- while ((state_node = of_parse_phandle(cpu_node, "cpu-idle-states",
- count))) {
- count++;
- of_node_put(state_node);
- }
-
- if (!count)
- return -ENODEV;
-
- count++; /* Add WFI state too */
- psci_states = kcalloc(count, sizeof(*psci_states), GFP_KERNEL);
+ state_count++; /* Add WFI state too */
+ psci_states = kcalloc(state_count, sizeof(*psci_states), GFP_KERNEL);
if (!psci_states)
return -ENOMEM;
- for (i = 1; i < count; i++) {
+ for (i = 1; i < state_count; i++) {
state_node = of_parse_phandle(cpu_node, "cpu-idle-states",
i - 1);
+ if (!state_node)
+ break;
+
ret = psci_dt_parse_state_node(state_node, &psci_states[i]);
of_node_put(state_node);
@@ -106,6 +100,11 @@ static int __init psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu)
pr_debug("psci-power-state %#x index %d\n", psci_states[i], i);
}
+ if (i != state_count) {
+ ret = -ENODEV;
+ goto free_mem;
+ }
+
/* Idle states parsed correctly, initialize per-cpu pointer */
per_cpu(psci_power_state, cpu) = psci_states;
return 0;
@@ -115,7 +114,7 @@ static int __init psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu)
return ret;
}
-static __init int psci_cpu_init_idle(unsigned int cpu)
+static __init int psci_cpu_init_idle(unsigned int cpu, unsigned int state_count)
{
struct device_node *cpu_node;
int ret;
@@ -131,7 +130,7 @@ static __init int psci_cpu_init_idle(unsigned int cpu)
if (!cpu_node)
return -ENODEV;
- ret = psci_dt_cpu_init_idle(cpu_node, cpu);
+ ret = psci_dt_cpu_init_idle(cpu_node, state_count, cpu);
of_node_put(cpu_node);
@@ -187,7 +186,7 @@ static int __init psci_idle_init_cpu(int cpu)
/*
* Initialize PSCI idle states.
*/
- ret = psci_cpu_init_idle(cpu);
+ ret = psci_cpu_init_idle(cpu, ret);
if (ret) {
pr_err("CPU %d failed to PSCI idle\n", cpu);
goto out_kfree_drv;
--
2.17.1
next prev parent reply other threads:[~2019-11-27 10:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 10:29 [PATCH v3 00/13] cpuidle: psci: Support hierarchical CPU arrangement Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 01/13] cpuidle: psci: Align psci_power_state count with idle state count Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 02/13] dt: psci: Update DT bindings to support hierarchical PSCI states Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 03/13] firmware: psci: Export functions to manage the OSI mode Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 04/13] of: base: Add of_get_cpu_state_node() to get idle states for a CPU node Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 05/13] cpuidle: dt: Support hierarchical CPU idle states Ulf Hansson
2019-11-27 10:29 ` Ulf Hansson [this message]
2019-11-27 10:29 ` [PATCH v3 07/13] cpuidle: psci: " Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 08/13] cpuidle: psci: Add a helper to attach a CPU to its PM domain Ulf Hansson
2019-11-28 14:14 ` Lorenzo Pieralisi
2019-11-28 17:21 ` Ulf Hansson
2019-11-28 18:31 ` Lorenzo Pieralisi
2019-11-28 22:04 ` Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 09/13] cpuidle: psci: Attach CPU devices to their PM domains Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 10/13] cpuidle: psci: Prepare to use OS initiated suspend mode via " Ulf Hansson
2019-12-05 18:35 ` Lorenzo Pieralisi
2019-12-05 20:25 ` Ulf Hansson
2019-12-05 20:38 ` Ulf Hansson
2019-12-06 11:25 ` Lorenzo Pieralisi
2019-12-06 14:26 ` Ulf Hansson
2019-12-06 15:14 ` Lorenzo Pieralisi
2019-12-06 17:23 ` Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 11/13] cpuidle: psci: Manage runtime PM in the idle path Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 12/13] cpuidle: psci: Add support for PM domains by using genpd Ulf Hansson
2019-11-27 10:29 ` [PATCH v3 13/13] arm64: dts: Convert to the hierarchical CPU topology layout for MSM8916 Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191127102914.18729-7-ulf.hansson@linaro.org \
--to=ulf.hansson@linaro.org \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=ilina@codeaurora.org \
--cc=khilman@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).