[PATCH 1/3] arm64: psci: warn if psci_power_state variable is not initialised
From: Amit Daniel Kachhap <hidden>
Date: 2014-10-30 03:55:36
Also in:
linux-pm
Subsystem:
arm64 port (aarch64 architecture), the rest · Maintainers:
Catalin Marinas, Will Deacon, Linus Torvalds
Without this cpu_suspend may cause crash dump when psci cpuidle is not initialised and cpu_suspend is called. Signed-off-by: Amit Daniel Kachhap <redacted> --- arch/arm64/kernel/psci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index 866c1c8..2178d6e 100644
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c@@ -523,9 +523,11 @@ static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) struct psci_power_state *state = __get_cpu_var(psci_power_state); /* * idle state index 0 corresponds to wfi, should never be called - * from the cpu_suspend operations + * from the cpu_suspend operations. + * Also psci_power_state variable should have been populated by + * above init idle routine. */ - if (WARN_ON_ONCE(!index)) + if (WARN_ON_ONCE(!index || !state)) return -EINVAL; if (state->type == PSCI_POWER_STATE_TYPE_STANDBY)
--
1.9.1