hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mips/loongson/smp: Convert to hotplug state machine 

Install the callbacks via the state machine.

[ tglx: Reuse the MIPS_SOC_PREPARE state ]

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/20160906170457.32393-17-bigeasy@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Sebastian Andrzej Siewior 2016-09-06 19:04:52 +02:00 committed by Thomas Gleixner
parent dd6d7c6f3d
commit e476d31291
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/mips/loongson64/loongson-3/smp.c
View File

@ -677,7 +677,7 @@ void play_dead(void)
play_dead_at_ckseg1(state_addr); 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 core_id = cpu_data[cpu].core;
uint64_t package_id = cpu_data[cpu].package; uint64_t package_id = cpu_data[cpu].package;
@ -688,9 +688,10 @@ void loongson3_disable_clock(int cpu)
if (!(loongson_sysconf.workarounds & WORKAROUND_CPUHOTPLUG)) if (!(loongson_sysconf.workarounds & WORKAROUND_CPUHOTPLUG))
LOONGSON_FREQCTRL(package_id) &= ~(1 << (core_id * 4 + 3)); 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 core_id = cpu_data[cpu].core;
uint64_t package_id = cpu_data[cpu].package; uint64_t package_id = cpu_data[cpu].package;
@ -701,34 +702,15 @@ void loongson3_enable_clock(int cpu)
if (!(loongson_sysconf.workarounds & WORKAROUND_CPUHOTPLUG)) if (!(loongson_sysconf.workarounds & WORKAROUND_CPUHOTPLUG))
LOONGSON_FREQCTRL(package_id) |= 1 << (core_id * 4 + 3); LOONGSON_FREQCTRL(package_id) |= 1 << (core_id * 4 + 3);
} }
} return 0;
#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;
} }
static int register_loongson3_notifier(void) static int register_loongson3_notifier(void)
{ {
hotcpu_notifier(loongson3_cpu_callback, 0); return cpuhp_setup_state_nocalls(CPUHP_MIPS_SOC_PREPARE,
return 0; "mips/loongson:prepare",
loongson3_enable_clock,
loongson3_disable_clock);
} }
early_initcall(register_loongson3_notifier); early_initcall(register_loongson3_notifier);