On 28/02/2019 23:26, Ulf Hansson wrote: > On Thu, 28 Feb 2019 at 16:40, Daniel Lezcano <daniel.lezc...@linaro.org> > wrote: >> >> On 28/02/2019 14:59, Ulf Hansson wrote: >>> Instead of iterating through all the state nodes in DT, to find out how >>> many states that needs to be allocated, let's use the number already known >>> by the cpuidle driver. In this way we can drop the iteration altogether. >>> >>> Signed-off-by: Ulf Hansson <ulf.hans...@linaro.org> >>> --- >>> drivers/firmware/psci/psci.c | 25 ++++++++++++------------- >>> 1 file changed, 12 insertions(+), 13 deletions(-) >>> >>> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c >>> index d50b46a0528f..cbfc936d251c 100644 >>> --- a/drivers/firmware/psci/psci.c >>> +++ b/drivers/firmware/psci/psci.c >>> @@ -290,26 +290,20 @@ static int psci_dt_parse_state_node(struct >>> device_node *np, u32 *state) >>> static int psci_dt_cpu_init_idle(struct cpuidle_driver *drv, >>> struct device_node *cpu_node, int cpu) >>> { >>> - int i, ret = 0, count = 0; >>> + int i, ret = 0, num_state_nodes = drv->state_count - 1; >> >> why -1 ? > > Because of the WFI state. The cpuidle-arm driver always carries this > state at index 0, which also is never used in > psci_cpu_suspend_enter(), where the similar is taken into account. > > It's a bit of magic, so perhaps someone should post a patch that > documents this a bit better in the code, wherever it makes sense.
Ah yes, right. The first state is already filled with the WFI state in the cpuidle-arm.c driver and we must infer the index passed to dt_init_idle_driver is 1 because of that. Acked-by: Daniel Lezcano <daniel.lezc...@linaro.org> [ ... ] -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog