Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f464adb2 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

ARM: Fix deadlock scenario with smp_send_stop()



If one process calls sys_reboot and that process then stops other
CPUs while those CPUs are within a spin_lock() region we can
potentially encounter a deadlock scenario like below.

CPU 0                   CPU 1
-----                   -----
                        spin_lock(my_lock)
smp_send_stop()
 send_IPI               handle_IPI()
                         disable_preemption/irqs
                          while(1);
 <PREEMPT>
spin_lock(my_lock) <--- Waits forever

We shouldn't attempt to run any other tasks after we send a stop
IPI to a CPU so disable preemption so that this task runs to
completion.

Change-Id: I528af0b4448433bd9d6ca12d6a0e2c422a55d4be
CRs-Fixed: 396169
Reported-by: default avatarSundarajan Srinivasan <sundaraj@codeaurora.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 6a0bafe5
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ void machine_shutdown(void)
 */
void machine_halt(void)
{
	preempt_disable();
	smp_send_stop();

	local_irq_disable();
@@ -220,6 +221,7 @@ void machine_halt(void)
 */
void machine_power_off(void)
{
	preempt_disable();
	smp_send_stop();

	if (pm_power_off)
@@ -239,6 +241,7 @@ void machine_power_off(void)
 */
void machine_restart(char *cmd)
{
	preempt_disable();
	smp_send_stop();

	arm_pm_restart(reboot_mode, cmd);