[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAAhV-H4rbDp86cnrYn-2t05Sv17=LV6Hfchb=dBSeD3oc6x5kQ@mail.gmail.com>
Date: Thu, 16 Aug 2012 11:47:06 +0800
From: Huacai Chen <chenhc@...ote.com>
To: Ralf Baechle <ralf@...ux-mips.org>
Cc: linux-mips@...ux-mips.org, linux-kernel@...r.kernel.org,
Fuxin Zhang <zhangfx@...ote.com>,
Zhangjin Wu <wuzhangjin@...il.com>,
Hongliang Tao <taohl@...ote.com>, Hua Yan <yanh@...ote.com>,
Yong Zhang <yong.zhang@...driver.com>, stable@...r.kernel.org
Subject: Re: [PATCH V2] MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
On Tue, Aug 14, 2012 at 7:48 PM, Ralf Baechle <ralf@...ux-mips.org> wrote:
> On Mon, Aug 13, 2012 at 08:52:24PM +0800, Huacai Chen wrote:
>
>> 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.
>
>> 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))
>
> Looks good - but I'm wondering if the "!cpu_isset(cpu, cpu_callin_map)"
> can be removed as well?
I removed "!cpu_isset(cpu, cpu_callin_map)" and it works well on
Loongson, but I don't know whether it will affect cavium-octeon...
>
> Also, which -stable branches is this patch applicable?
>
> Ralf
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists