sh/cpu: Switch to arch_cpu_finalize_init()

commit 01eb454e9bfe593f320ecbc9aaec60bf87cd453d upstream

check_bugs() is about to be phased out. Switch over to the new
arch_cpu_finalize_init() implementation.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230613224545.371697797@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/sh/Kconfig b/arch/sh/Kconfig
index 97fe2931647648329c1b4b0bb88e8c3ac81e885f..039228cb358cf44b4d5da32a28c2e47b91930990 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config SUPERH
        def_bool y
+       select ARCH_HAS_CPU_FINALIZE_INIT
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_NO_COHERENT_DMA_MMAP if !MMU

diff --git a/arch/sh/include/asm/bugs.h b/arch/sh/include/asm/bugs.h
deleted file mode 100644 (file)
index 030df56..0000000
--- a/arch/sh/include/asm/bugs.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __ASM_SH_BUGS_H
-#define __ASM_SH_BUGS_H
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *     void check_bugs(void);
- */
-
-/*
- * I don't know of any Super-H bugs yet.
- */
-
-#include <asm/processor.h>
-
-extern void select_idle_routine(void);
-
-static void __init check_bugs(void)
-{
-       extern unsigned long loops_per_jiffy;
-       char *p = &init_utsname()->machine[2]; /* "sh" */
-
-       select_idle_routine();
-
-       current_cpu_data.loops_per_jiffy = loops_per_jiffy;
-
-       switch (current_cpu_data.family) {
-       case CPU_FAMILY_SH2:
-               *p++ = '2';
-               break;
-       case CPU_FAMILY_SH2A:
-               *p++ = '2';
-               *p++ = 'a';
-               break;
-       case CPU_FAMILY_SH3:
-               *p++ = '3';
-               break;
-       case CPU_FAMILY_SH4:
-               *p++ = '4';
-               break;
-       case CPU_FAMILY_SH4A:
-               *p++ = '4';
-               *p++ = 'a';
-               break;
-       case CPU_FAMILY_SH4AL_DSP:
-               *p++ = '4';
-               *p++ = 'a';
-               *p++ = 'l';
-               *p++ = '-';
-               *p++ = 'd';
-               *p++ = 's';
-               *p++ = 'p';
-               break;
-       case CPU_FAMILY_SH5:
-               *p++ = '6';
-               *p++ = '4';
-               break;
-       case CPU_FAMILY_UNKNOWN:
-               /*
-                * Specifically use CPU_FAMILY_UNKNOWN rather than
-                * default:, so we're able to have the compiler whine
-                * about unhandled enumerations.
-                */
-               break;
-       }
-
-       printk("CPU: %s\n", get_cpu_subtype(&current_cpu_data));
-
-#ifndef __LITTLE_ENDIAN__
-       /* 'eb' means 'Endian Big' */
-       *p++ = 'e';
-       *p++ = 'b';
-#endif
-       *p = '\0';
-}
-#endif /* __ASM_SH_BUGS_H */

diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h
index 6fbf8c80e4981d1fa3cd78fd28e3224552247a3b..386786b1594ab06127bfbcfde86904200f084317 100644 (file)
--- a/arch/sh/include/asm/processor.h
+++ b/arch/sh/include/asm/processor.h
@@ -173,6 +173,8 @@ extern unsigned int instruction_size(unsigned int insn);
 #define instruction_size(insn) (4)
 #endif
 
+void select_idle_routine(void);
+
 #endif /* __ASSEMBLY__ */
 
 #ifdef CONFIG_SUPERH32

diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index be616ee0cf8799a6c7deeb058a7a92da6a8f213c..5169309fdf98c23d062ead7f4429935c7d9c216f 100644 (file)
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -18,6 +18,7 @@
 #include <linux/smp.h>
 #include <linux/atomic.h>
 #include <asm/pgalloc.h>
+#include <asm/processor.h>
 #include <asm/smp.h>
 #include <asm/bl_bit.h>
 

diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index b95c411d03337e4b44edaa895437e253eeeed948..1c06d36f234c840c05c611a4dd426df4cbf5bf3b 100644 (file)
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -43,6 +43,7 @@
 #include <asm/smp.h>
 #include <asm/mmu_context.h>
 #include <asm/mmzone.h>
+#include <asm/processor.h>
 #include <asm/sparsemem.h>
 
 /*
@@ -354,3 +355,57 @@ int test_mode_pin(int pin)
 {
        return sh_mv.mv_mode_pins() & pin;
 }
+
+void __init arch_cpu_finalize_init(void)
+{
+       char *p = &init_utsname()->machine[2]; /* "sh" */
+
+       select_idle_routine();
+
+       current_cpu_data.loops_per_jiffy = loops_per_jiffy;
+
+       switch (current_cpu_data.family) {
+       case CPU_FAMILY_SH2:
+               *p++ = '2';
+               break;
+       case CPU_FAMILY_SH2A:
+               *p++ = '2';
+               *p++ = 'a';
+               break;
+       case CPU_FAMILY_SH3:
+               *p++ = '3';
+               break;
+       case CPU_FAMILY_SH4:
+               *p++ = '4';
+               break;
+       case CPU_FAMILY_SH4A:
+               *p++ = '4';
+               *p++ = 'a';
+               break;
+       case CPU_FAMILY_SH4AL_DSP:
+               *p++ = '4';
+               *p++ = 'a';
+               *p++ = 'l';
+               *p++ = '-';
+               *p++ = 'd';
+               *p++ = 's';
+               *p++ = 'p';
+               break;
+       case CPU_FAMILY_UNKNOWN:
+               /*
+                * Specifically use CPU_FAMILY_UNKNOWN rather than
+                * default:, so we're able to have the compiler whine
+                * about unhandled enumerations.
+                */
+               break;
+       }
+
+       pr_info("CPU: %s\n", get_cpu_subtype(&current_cpu_data));
+
+#ifndef __LITTLE_ENDIAN__
+       /* 'eb' means 'Endian Big' */
+       *p++ = 'e';
+       *p++ = 'b';
+#endif
+       *p = '\0';
+}