Skip to content

Commit 51e0efe

Browse files
KAGA-KOKOPeter Zijlstra
authored andcommitted
parisc: Switch to hotplug core state synchronization
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> 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.859920443@linutronix.de
1 parent c8d2bcc commit 51e0efe

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

arch/parisc/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ config PARISC
5757
select HAVE_ARCH_SECCOMP_FILTER
5858
select HAVE_ARCH_TRACEHOOK
5959
select HAVE_REGS_AND_STACK_ACCESS_API
60+
select HOTPLUG_CORE_SYNC_DEAD if HOTPLUG_CPU
6061
select GENERIC_SCHED_CLOCK
6162
select GENERIC_IRQ_MIGRATION if SMP
6263
select HAVE_UNSTABLE_SCHED_CLOCK if SMP

arch/parisc/kernel/process.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ void __noreturn arch_cpu_idle_dead(void)
166166

167167
local_irq_disable();
168168

169-
/* Tell __cpu_die() that this CPU is now safe to dispose of. */
170-
(void)cpu_report_death();
169+
/* Tell the core that this CPU is now safe to dispose of. */
170+
cpuhp_ap_report_dead();
171171

172172
/* Ensure that the cache lines are written out. */
173173
flush_cache_all_local();

arch/parisc/kernel/smp.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,11 +500,10 @@ int __cpu_disable(void)
500500
void __cpu_die(unsigned int cpu)
501501
{
502502
pdc_cpu_rendezvous_lock();
503+
}
503504

504-
if (!cpu_wait_death(cpu, 5)) {
505-
pr_crit("CPU%u: cpu didn't die\n", cpu);
506-
return;
507-
}
505+
void arch_cpuhp_cleanup_dead_cpu(unsigned int cpu)
506+
{
508507
pr_info("CPU%u: is shutting down\n", cpu);
509508

510509
/* set task's state to interruptible sleep */

0 commit comments

Comments
 (0)