linux-mips
[Top] [All Lists]

[PATCH V5 17/18] MIPS: Fix poweroff failure when HOTPLUG_CPU configured.

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH V5 17/18] MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
From: Huacai Chen <chenhuacai@gmail.com>
Date: Sat, 11 Aug 2012 17:32:22 +0800
Cc: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, Fuxin Zhang <zhangfx@lemote.com>, Zhangjin Wu <wuzhangjin@gmail.com>, Huacai Chen <chenhc@lemote.com>, Hongliang Tao <taohl@lemote.com>, Hua Yan <yanh@lemote.com>, stable@vger.kernel.org
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=gi7q2TFBpO5Fo+No/pyrdu6Tne6S2cYh6BehiIcFeVY=; b=fSrd5SI08WiFOMGcb8AhNX/wyP1oLMo0QVaS1UtfPbtIxjiSjoDFc4n0UiMNiNWeqY Zv5ZhlAYfbWgZ5XoRo7jM/yLSj/+Z0gas1WFYWLQK7+BUC/l3JqAo+eK8fk3W50rK8jc 9GxJqjx2pIjCJhfhuoZh7vlOrJdd+QHDbx/0y/QIE5iSRRa/GvGCKzP2at3CS26EtO4b sVkEqaJk9StJl72z/AfHhmusEcyg7gYyqe0gHPQQe/1Q3QxqLM8XpXN+Yocl+FxUfmPI mDPLzaGvABnTgl4UWn8j+Lur8IbU+9C3Ny4hZdswUg6LZQhRcYHTnz9ZW+bZTDnZby4O uhaw==
In-reply-to: <1344677543-22591-1-git-send-email-chenhc@lemote.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
References: <1344677543-22591-1-git-send-email-chenhc@lemote.com>
Sender: linux-mips-bounce@linux-mips.org
When poweroff machine, kernel_power_off() call disable_nonboot_cpus().
And if we have HOTPLUG_CPU configured, disable_nonboot_cpus() is not an
empty function but attempt to actually disable the nonboot cpus. Since
system state is SYSTEM_POWER_OFF, play_dead() won't be called and thus
disable_nonboot_cpus() hangs. Therefore, we make this patch to avoid
poweroff failure.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Hongliang Tao <taohl@lemote.com>
Signed-off-by: Hua Yan <yanh@lemote.com>
Cc: stable@vger.kernel.org
---
 arch/mips/kernel/process.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index e9a5fd7..69b17a9 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -72,9 +72,7 @@ void __noreturn cpu_idle(void)
                        }
                }
 #ifdef CONFIG_HOTPLUG_CPU
-               if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map) &&
-                   (system_state == SYSTEM_RUNNING ||
-                    system_state == SYSTEM_BOOTING))
+               if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map))
                        play_dead();
 #endif
                rcu_idle_exit();
-- 
1.7.7.3


<Prev in Thread] Current Thread [Next in Thread>