lkml.org 
[lkml]   [2016]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/21] mips: loongson: smp: Convert to hotplug state machine
    Date
    Install the callbacks via the state machine.

    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: linux-mips@linux-mips.org
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    ---
    arch/mips/loongson64/loongson-3/smp.c | 34 ++++++++--------------------------
    include/linux/cpuhotplug.h | 1 +
    2 files changed, 9 insertions(+), 26 deletions(-)

    diff --git a/arch/mips/loongson64/loongson-3/smp.c b/arch/mips/loongson64/loongson-3/smp.c
    index 2fec6f753a35..bd7c8cf5332d 100644
    --- a/arch/mips/loongson64/loongson-3/smp.c
    +++ b/arch/mips/loongson64/loongson-3/smp.c
    @@ -677,7 +677,7 @@ void play_dead(void)
    play_dead_at_ckseg1(state_addr);
    }

    -void loongson3_disable_clock(int cpu)
    +static int loongson3_disable_clock(unsigned int cpu)
    {
    uint64_t core_id = cpu_data[cpu].core;
    uint64_t package_id = cpu_data[cpu].package;
    @@ -688,9 +688,10 @@ void loongson3_disable_clock(int cpu)
    if (!(loongson_sysconf.workarounds & WORKAROUND_CPUHOTPLUG))
    LOONGSON_FREQCTRL(package_id) &= ~(1 << (core_id * 4 + 3));
    }
    + return 0;
    }

    -void loongson3_enable_clock(int cpu)
    +static int loongson3_enable_clock(unsigned int cpu)
    {
    uint64_t core_id = cpu_data[cpu].core;
    uint64_t package_id = cpu_data[cpu].package;
    @@ -701,34 +702,15 @@ void loongson3_enable_clock(int cpu)
    if (!(loongson_sysconf.workarounds & WORKAROUND_CPUHOTPLUG))
    LOONGSON_FREQCTRL(package_id) |= 1 << (core_id * 4 + 3);
    }
    -}
    -
    -#define CPU_POST_DEAD_FROZEN (CPU_POST_DEAD | CPU_TASKS_FROZEN)
    -static int loongson3_cpu_callback(struct notifier_block *nfb,
    - unsigned long action, void *hcpu)
    -{
    - unsigned int cpu = (unsigned long)hcpu;
    -
    - switch (action) {
    - case CPU_POST_DEAD:
    - case CPU_POST_DEAD_FROZEN:
    - pr_info("Disable clock for CPU#%d\n", cpu);
    - loongson3_disable_clock(cpu);
    - break;
    - case CPU_UP_PREPARE:
    - case CPU_UP_PREPARE_FROZEN:
    - pr_info("Enable clock for CPU#%d\n", cpu);
    - loongson3_enable_clock(cpu);
    - break;
    - }
    -
    - return NOTIFY_OK;
    + return 0;
    }

    static int register_loongson3_notifier(void)
    {
    - hotcpu_notifier(loongson3_cpu_callback, 0);
    - return 0;
    + return cpuhp_setup_state_nocalls(CPUHP_MIPS_LOONGSON_PREPARE,
    + "mips/loongson:prepare",
    + loongson3_enable_clock,
    + loongson3_disable_clock);
    }
    early_initcall(register_loongson3_notifier);

    diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
    index 058d312fdf6f..9e56be3eaf3f 100644
    --- a/include/linux/cpuhotplug.h
    +++ b/include/linux/cpuhotplug.h
    @@ -45,6 +45,7 @@ enum cpuhp_state {
    CPUHP_X86_MICRCODE_PREPARE,
    CPUHP_NOTF_ERR_INJ_PREPARE,
    CPUHP_MIPS_CAVIUM_PREPARE,
    + CPUHP_MIPS_LOONGSON_PREPARE,
    CPUHP_TIMERS_DEAD,
    CPUHP_BRINGUP_CPU,
    CPUHP_AP_IDLE_DEAD,
    --
    2.9.3
    \
     
     \ /
      Last update: 2016-09-17 09:58    [W:3.571 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site