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

Commit 377bcff9 authored by Jonas Rabenstein's avatar Jonas Rabenstein Committed by Will Deacon
Browse files

arm64: remove dead-code depending on CONFIG_UP_LATE_INIT 



Commit 4b3dc967 ("arm64: force CONFIG_SMP=y and remove redundant
and therfore can not be selected anymore.

Remove dead #ifdef-block depending on UP_LATE_INIT in
arch/arm64/kernel/setup.c

Signed-off-by: default avatarJonas Rabenstein <jonas.rabenstein@studium.uni-erlangen.de>
[will: kill do_post_cpus_up_work altogether]
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 766ffb69

arch/arm64/include/asm/smp_plat.h

+0 −2
Original line number Diff line number Diff line
@@ -56,6 +56,4 @@ static inline int get_logical_index(u64 mpidr) 
	return -EINVAL;

}



void __init do_post_cpus_up_work(void);



#endif /* __ASM_SMP_PLAT_H */

arch/arm64/kernel/setup.c

+0 −25
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ 
#include <asm/memblock.h>

#include <asm/psci.h>

#include <asm/efi.h>

#include <asm/virt.h>

#include <asm/xen/hypervisor.h>



unsigned long elf_hwcap __read_mostly;
@@ -197,30 +196,6 @@ static void __init smp_build_mpidr_hash(void) 
	__flush_dcache_area(&mpidr_hash, sizeof(struct mpidr_hash));

}



static void __init hyp_mode_check(void)

{

	if (is_hyp_mode_available())

		pr_info("CPU: All CPU(s) started at EL2\n");

	else if (is_hyp_mode_mismatched())

		WARN_TAINT(1, TAINT_CPU_OUT_OF_SPEC,

			   "CPU: CPUs started in inconsistent modes");

	else

		pr_info("CPU: All CPU(s) started at EL1\n");

}



void __init do_post_cpus_up_work(void)

{

	hyp_mode_check();

	apply_alternatives_all();

}



#ifdef CONFIG_UP_LATE_INIT

void __init up_late_init(void)

{

	do_post_cpus_up_work();

}

#endif /* CONFIG_UP_LATE_INIT */



static void __init setup_processor(void)

{

	u64 features;

arch/arm64/kernel/smp.c

+14 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <asm/sections.h>

#include <asm/tlbflush.h>

#include <asm/ptrace.h>

#include <asm/virt.h>



#define CREATE_TRACE_POINTS

#include <trace/events/ipi.h>
@@ -310,10 +311,22 @@ void cpu_die(void) 
}

#endif



static void __init hyp_mode_check(void)

{

	if (is_hyp_mode_available())

		pr_info("CPU: All CPU(s) started at EL2\n");

	else if (is_hyp_mode_mismatched())

		WARN_TAINT(1, TAINT_CPU_OUT_OF_SPEC,

			   "CPU: CPUs started in inconsistent modes");

	else

		pr_info("CPU: All CPU(s) started at EL1\n");

}



void __init smp_cpus_done(unsigned int max_cpus)

{

	pr_info("SMP: Total of %d processors activated.\n", num_online_cpus());

	do_post_cpus_up_work();

	hyp_mode_check();

	apply_alternatives_all();

}



void __init smp_prepare_boot_cpu(void)