From: Huacai Chen <chenhuacai@gmail.com>
To: Ralf Baechle <ralf@linux-mips.org>
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
Subject: [PATCH V4 15/16] MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
Date: Fri, 3 Aug 2012 15:06:10 +0800 [thread overview]
Message-ID: <1343977571-2292-16-git-send-email-chenhc@lemote.com> (raw)
In-Reply-To: <1343977571-2292-1-git-send-email-chenhc@lemote.com>
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
next prev parent reply other threads:[~2012-08-03 7:08 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-03 7:05 [PATCH V4 00/16] MIPS: Add Loongson-3 based machines support Huacai Chen
2012-08-03 7:05 ` [PATCH V4 01/16] MIPS: Loongson: Add basic Loongson-3 definition Huacai Chen
2012-08-03 7:05 ` [PATCH V4 02/16] MIPS: Loongson: Add basic Loongson-3 CPU support Huacai Chen
2012-08-03 7:05 ` [PATCH V4 03/16] MIPS: Loongson 3: Add Lemote-3A machtypes definition Huacai Chen
2012-08-03 7:05 ` [PATCH V4 04/16] MIPS: Loongson: Make Loongson-3 to use BCD format for RTC Huacai Chen
2012-08-03 7:06 ` [PATCH V4 05/16] MIPS: Loongson: Add UEFI-like firmware interface support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 06/16] MIPS: Loongson 3: Add HT-linked PCI support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 07/16] MIPS: Loongson 3: Add IRQ init and dispatch support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 08/16] MIPS: Loongson 3: Add serial port support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 09/16] MIPS: Loongson: Add swiotlb to support big memory (>4GB) Huacai Chen
2012-08-03 7:06 ` [PATCH V4 10/16] MIPS: Loongson: Add Loongson-3 Kconfig options Huacai Chen
2012-08-03 7:06 ` [PATCH V4 11/16] drm/radeon: Make radeon card usable for Loongson Huacai Chen
2012-08-03 8:01 ` Michel Dänzer
2012-08-03 10:29 ` Huacai Chen
2012-08-03 7:06 ` [PATCH V4 12/16] ALSA: HDA: Make hda sound " Huacai Chen
2012-08-03 9:24 ` [alsa-devel] " Takashi Iwai
2012-08-03 10:36 ` Huacai Chen
2012-08-03 14:56 ` Takashi Iwai
2012-08-03 7:06 ` [PATCH V4 13/16] MIPS: Loongson 3: Add Loongson-3 SMP support Huacai Chen
2012-08-03 7:06 ` [PATCH V4 14/16] MIPS: Loongson 3: Add CPU hotplug support Huacai Chen
2012-08-03 7:06 ` Huacai Chen [this message]
2012-08-03 7:06 ` [PATCH V4 16/16] MIPS: Loongson: Add a Loongson-3 default config file Huacai Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343977571-2292-16-git-send-email-chenhc@lemote.com \
--to=chenhuacai@gmail.com \
--cc=chenhc@lemote.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
--cc=stable@vger.kernel.org \
--cc=taohl@lemote.com \
--cc=wuzhangjin@gmail.com \
--cc=yanh@lemote.com \
--cc=zhangfx@lemote.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox