Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fce6361f authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Catalin Marinas
Browse files

arm64: Move cpu_die_early to smp.c 



This patch moves cpu_die_early to smp.c, where it fits better.
No functional changes, except for adding the necessary checks
for CONFIG_HOTPLUG_CPU.

Cc: Mark Rutland <mark.rutland@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent ee02a159

arch/arm64/include/asm/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ extern int __cpu_disable(void); 


extern void __cpu_die(unsigned int cpu);

extern void cpu_die(void);

extern void cpu_die_early(void);



static inline void cpu_park_loop(void)

{

arch/arm64/kernel/cpufeature.c

+0 −19
Original line number Diff line number Diff line
@@ -874,25 +874,6 @@ static u64 __raw_read_system_reg(u32 sys_id) 
	}

}



/*

 * Kill the calling secondary CPU, early in bringup before it is turned

 * online.

 */

void cpu_die_early(void)

{

	int cpu = smp_processor_id();



	pr_crit("CPU%d: will not boot\n", cpu);



	/* Mark this CPU absent */

	set_cpu_present(cpu, 0);



	/* Check if we can park ourselves */

	if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_die)

		cpu_ops[cpu]->cpu_die(cpu);

	cpu_park_loop();

}



/*

 * Run through the enabled system capabilities and enable() it on this CPU.

 * The capabilities were decided based on the available CPUs at the boot time.

arch/arm64/kernel/smp.c

+22 −0
Original line number Diff line number Diff line
@@ -312,6 +312,28 @@ void cpu_die(void) 
}

#endif



/*

 * Kill the calling secondary CPU, early in bringup before it is turned

 * online.

 */

void cpu_die_early(void)

{

	int cpu = smp_processor_id();



	pr_crit("CPU%d: will not boot\n", cpu);



	/* Mark this CPU absent */

	set_cpu_present(cpu, 0);



#ifdef CONFIG_HOTPLUG_CPU

	/* Check if we can park ourselves */

	if (cpu_ops[cpu] && cpu_ops[cpu]->cpu_die)

		cpu_ops[cpu]->cpu_die(cpu);

#endif



	cpu_park_loop();

}



static void __init hyp_mode_check(void)

{

	if (is_hyp_mode_available())