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 8e4d1f757bcc937182527f33bc065fcad7607d2e..a0593f6ce0e0fd5caf5b5cc86016610a8eb2e207 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -7,6 +7,7 @@ config SUPERH
        select ARCH_HAVE_CUSTOM_GPIO_H
        select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)
        select ARCH_HAS_BINFMT_FLAT if !MMU
+       select ARCH_HAS_CPU_FINALIZE_INIT
        select ARCH_HAS_CURRENT_STACK_POINTER
        select ARCH_HAS_GIGANTIC_PAGE
        select ARCH_HAS_GCOV_PROFILE_ALL

diff --git a/arch/sh/include/asm/bugs.h b/arch/sh/include/asm/bugs.h
deleted file mode 100644 (file)
index fe52abb..0000000
--- a/arch/sh/include/asm/bugs.h
+++ /dev/null
@@ -1,74 +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_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 85a6c1c3c16e70019a8ff55982ffc4bec7dbc9af..73fba7c922f929646a88c439bd827101738b6b94 100644 (file)
--- a/arch/sh/include/asm/processor.h
+++ b/arch/sh/include/asm/processor.h
@@ -166,6 +166,8 @@ extern unsigned int instruction_size(unsigned int insn);
 #define instruction_size(insn) (2)
 #endif
 
+void select_idle_routine(void);
+
 #endif /* __ASSEMBLY__ */
 
 #include <asm/processor_32.h>

diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index f59814983bd59ffcf5be94d45124f6f5c34399d3..a80b2a5b25c7f5aac41e6ea87d2abd11d8a3c81b 100644 (file)
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -14,6 +14,7 @@
 #include <linux/irqflags.h>
 #include <linux/smp.h>
 #include <linux/atomic.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 af977ec4ca5e5b51ae7be1870b5a0f5fdce2a628..cf7c0f72f2935a36f882893c757f20d8bce38a65 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>
 #include <asm/platform_early.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';
+}