lkml.org 
[lkml]   [2018]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 09/11] drivers: firmware: psci: Split psci_dt_cpu_init_idle()
    Date
    Let's split psci_dt_cpu_init_idle() function into two functions, as to
    allow following changes to re-use some of the code.

    Cc: Lina Iyer <ilina@codeaurora.org>
    Co-developed-by: Lina Iyer <lina.iyer@linaro.org>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    ---
    drivers/firmware/psci/psci.c | 42 ++++++++++++++++++++----------------
    1 file changed, 23 insertions(+), 19 deletions(-)

    diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c
    index c80ec1d03274..9788bfc1cf8b 100644
    --- a/drivers/firmware/psci/psci.c
    +++ b/drivers/firmware/psci/psci.c
    @@ -270,9 +270,26 @@ static int __init psci_features(u32 psci_func_id)
    #ifdef CONFIG_CPU_IDLE
    static DEFINE_PER_CPU_READ_MOSTLY(u32 *, psci_power_state);

    +static int psci_dt_parse_state_node(struct device_node *np, u32 *state)
    +{
    + int err = of_property_read_u32(np, "arm,psci-suspend-param", state);
    +
    + if (err) {
    + pr_warn("%pOF missing arm,psci-suspend-param property\n", np);
    + return err;
    + }
    +
    + if (!psci_power_state_is_valid(*state)) {
    + pr_warn("Invalid PSCI power state %#x\n", *state);
    + return -EINVAL;
    + }
    +
    + return 0;
    +}
    +
    static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu)
    {
    - int i, ret, count = 0;
    + int i, ret = 0, count = 0;
    u32 *psci_states;
    struct device_node *state_node;

    @@ -291,29 +308,16 @@ static int psci_dt_cpu_init_idle(struct device_node *cpu_node, int cpu)
    return -ENOMEM;

    for (i = 0; i < count; i++) {
    - u32 state;
    -
    state_node = of_parse_phandle(cpu_node, "cpu-idle-states", i);
    + ret = psci_dt_parse_state_node(state_node, &psci_states[i]);
    + of_node_put(state_node);

    - ret = of_property_read_u32(state_node,
    - "arm,psci-suspend-param",
    - &state);
    - if (ret) {
    - pr_warn(" * %pOF missing arm,psci-suspend-param property\n",
    - state_node);
    - of_node_put(state_node);
    + if (ret)
    goto free_mem;
    - }

    - of_node_put(state_node);
    - pr_debug("psci-power-state %#x index %d\n", state, i);
    - if (!psci_power_state_is_valid(state)) {
    - pr_warn("Invalid PSCI power state %#x\n", state);
    - ret = -EINVAL;
    - goto free_mem;
    - }
    - psci_states[i] = state;
    + pr_debug("psci-power-state %#x index %d\n", psci_states[i], i);
    }
    +
    /* Idle states parsed correctly, initialize per-cpu pointer */
    per_cpu(psci_power_state, cpu) = psci_states;
    return 0;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-03 16:39    [W:4.117 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site