Commit afe787cf authored Jun 14, 2023 by Thomas Gleixner Committed by Greg Kroah-Hartman Aug 08, 2023

init: Provide arch_cpu_finalize_init()

commit 7725acaa4f0c04fbefb0e0d342635b967bb7d414 upstream

check_bugs() has become a dumping ground for all sorts of activities to
finalize the CPU initialization before running the rest of the init code.

Most are empty, a few do actual bug checks, some do alternative patching
and some cobble a CPU advertisement string together....

Aside of that the current implementation requires duplicated function
declaration and mostly empty header files for them.

Provide a new function arch_cpu_finalize_init(). Provide a generic
declaration if CONFIG_ARCH_HAS_CPU_FINALIZE_INIT is selected and a stub
inline otherwise.

This requires a temporary #ifdef in start_kernel() which will be removed
along with check_bugs() once the architectures are converted over.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230613224544.957805717@linutronix.de

Signed-off-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 887433e4

arch/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -271,6 +271,9 @@ config ARCH_HAS_UNCACHED_SEGMENT
		select ARCH_HAS_DMA_PREP_COHERENT
		bool

		config ARCH_HAS_CPU_FINALIZE_INIT
		bool

		# Select if arch init_task must go in the __init_task_data section
		config ARCH_TASK_STRUCT_ON_STACK
		bool

include/linux/cpu.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,12 @@ void arch_cpu_idle_enter(void);
		void arch_cpu_idle_exit(void);
		void arch_cpu_idle_dead(void);

		#ifdef CONFIG_ARCH_HAS_CPU_FINALIZE_INIT
		void arch_cpu_finalize_init(void);
		#else
		static inline void arch_cpu_finalize_init(void) { }
		#endif

		int cpu_report_state(int cpu);
		int cpu_check_up_prepare(int cpu);
		void cpu_set_state_online(int cpu);

init/main.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -772,7 +772,12 @@ asmlinkage __visible void __init start_kernel(void)
		delayacct_init();

		poking_init();

		arch_cpu_finalize_init();
		/* Temporary conditional until everything has been converted */
		#ifndef CONFIG_ARCH_HAS_CPU_FINALIZE_INIT
		check_bugs();
		#endif

		acpi_subsystem_init();
		arch_post_acpi_subsys_init();