lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 009/171] MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
    Date
    3.4-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: 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/kernel/process.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    --- 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();



    \
     
     \ /
      Last update: 2013-01-16 00:41    [W:4.087 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site