ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

riscv: Switch to hotplug core state synchronization

Browse Source 
Switch to the CPU hotplug core state tracking and synchronization
mechanim. No functional change intended.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: Helge Deller <deller@gmx.de> # parisc
Tested-by: Guilherme G. Piccoli <gpiccoli@igalia.com> # Steam Deck
Link: https://lore.kernel.org/r/20230512205256.916055844@linutronix.de
This commit is contained in:
Thomas Gleixner
2023-05-12 23:07:40 +02:00
committed by Peter Zijlstra
parent 51e0efe1f2
commit 72b11aa7f8
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/riscv/Kconfig
View File

@@ -122,6 +122,7 @@ config RISCV
select HAVE_RSEQ select HAVE_RSEQ
select HAVE_STACKPROTECTOR select HAVE_STACKPROTECTOR
select HAVE_SYSCALL_TRACEPOINTS select HAVE_SYSCALL_TRACEPOINTS
select HOTPLUG_CORE_SYNC_DEAD if HOTPLUG_CPU
select IRQ_DOMAIN select IRQ_DOMAIN
select IRQ_FORCED_THREADING select IRQ_FORCED_THREADING
select KASAN_VMALLOC if KASAN select KASAN_VMALLOC if KASAN

2
arch/riscv/include/asm/smp.h
View File

@@ -70,7 +70,7 @@ asmlinkage void smp_callin(void);
#if defined CONFIG_HOTPLUG_CPU #if defined CONFIG_HOTPLUG_CPU
int __cpu_disable(void); int __cpu_disable(void);
void __cpu_die(unsigned int cpu); static inline void __cpu_die(unsigned int cpu) { }
#endif /* CONFIG_HOTPLUG_CPU */ #endif /* CONFIG_HOTPLUG_CPU */
#else #else

14
arch/riscv/kernel/cpu-hotplug.c
View File

@@ -8,6 +8,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/cpuhotplug.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/sched/hotplug.h> #include <linux/sched/hotplug.h>
#include <asm/irq.h> #include <asm/irq.h>
@@ -49,17 +50,15 @@ int __cpu_disable(void)
return ret; return ret;
} }
#ifdef CONFIG_HOTPLUG_CPU
/* /*
* Called on the thread which is asking for a CPU to be shutdown. * Called on the thread which is asking for a CPU to be shutdown, if the
* CPU reported dead to the hotplug core.
*/ */
void __cpu_die(unsigned int cpu) void arch_cpuhp_cleanup_dead_cpu(unsigned int cpu)
{ {
int ret = 0; int ret = 0;
if (!cpu_wait_death(cpu, 5)) {
pr_err("CPU %u: didn't die\n", cpu);
return;
}
pr_notice("CPU%u: off\n", cpu); pr_notice("CPU%u: off\n", cpu);
/* Verify from the firmware if the cpu is really stopped*/ /* Verify from the firmware if the cpu is really stopped*/
@@ -76,9 +75,10 @@ void __noreturn arch_cpu_idle_dead(void)
{ {
idle_task_exit(); idle_task_exit();
(void)cpu_report_death(); cpuhp_ap_report_dead();
cpu_ops[smp_processor_id()]->cpu_stop(); cpu_ops[smp_processor_id()]->cpu_stop();
/* It should never reach here */ /* It should never reach here */
BUG(); BUG();
} }
#endif