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>

diff --git a/arch/Kconfig b/arch/Kconfig
index 2219a07dca1ef3b0a8254314aff034d09b26c3d4..4d03616bf5970ad757f46d14b33183e83fa5898c 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -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

diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index b42e9c4134475af58a1c30d9e9bb7e32a2cf123c..782491dd19998bddf1866442d8503f00bd2c1e0a 100644 (file)
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -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);

diff --git a/init/main.c b/init/main.c
index a17a111d933626a9fbfa44bcc6ea4a9eabee6398..a7bb890fbcc3e4f28bdc98e7e228dc843bce4510 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -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();