linux-mips
[Top] [All Lists]

[PATCH 109/222] MIPS: Fix poweroff failure when HOTPLUG_CPU configured.

To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com
Subject: [PATCH 109/222] MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
From: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Date: Wed, 16 Jan 2013 13:55:09 -0200
Cc: Huacai Chen <chenhc@lemote.com>, Hongliang Tao <taohl@lemote.com>, Hua Yan <yanh@lemote.com>, Yong Zhang <yong.zhang@windriver.com>, linux-mips@linux-mips.org, Fuxin Zhang <zhangfx@lemote.com>, Zhangjin Wu <wuzhangjin@gmail.com>, Ralf Baechle <ralf@linux-mips.org>, Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
In-reply-to: <1358351822-7675-1-git-send-email-herton.krzesinski@canonical.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: <1358351822-7675-1-git-send-email-herton.krzesinski@canonical.com>
Sender: linux-mips-bounce@linux-mips.org
3.5.7.3 -stable review patch.  If anyone has any objections, please let me know.

------------------

From: Huacai Chen <chenhc@lemote.com>

commit 8add1ecb81f541ef2fcb0b85a5470ad9ecfb4a84 upstream.

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: Yong Zhang <yong.zhang@windriver.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/4211/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
---
 arch/mips/kernel/process.c |    4 +---
 1 file changed, 1 insertion(+), 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.9.5


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH 109/222] MIPS: Fix poweroff failure when HOTPLUG_CPU configured., Herton Ronaldo Krzesinski <=