Commit 0865d20c authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

drivers: firmware: psci: Split psci_dt_cpu_init_idle() 



Split the psci_dt_cpu_init_idle() function into two functions. This
makes the code clearer and provides better re-usability.

Co-developed-by: default avatarLina Iyer <lina.iyer@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f0f6ad90

drivers/firmware/psci/psci.c

+23 −19
Original line number Diff line number Diff line
@@ -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 = 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);

		ret = psci_dt_parse_state_node(state_node, &psci_states[i]);

		of_node_put(state_node);

			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;

		if (ret)

			goto free_mem;



		pr_debug("psci-power-state %#x index %d\n", psci_states[i], i);

	}

		psci_states[i] = state;

	}



	/* Idle states parsed correctly, initialize per-cpu pointer */

	per_cpu(psci_power_state, cpu) = psci_states;

	return 0;