Commit b12eb58f authored by Thomas Gleixner's avatar Thomas Gleixner Committed by sanglipeng
Browse files

sh/cpu: Switch to arch_cpu_finalize_init() 

stable inclusion
from stable-v5.10.189
commit 3c45134b38b417d17103f1f0b9a8b32f98ac358c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8LICQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=3c45134b38b417d17103f1f0b9a8b32f98ac358c



--------------------------------

commit 01eb454e 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: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230613224545.371697797@linutronix.de


Signed-off-by: default avatarDaniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 985577ed

arch/sh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,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_GIGANTIC_PAGE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_PTE_SPECIAL

arch/sh/include/asm/bugs.h

deleted100644 → 0
+0 −74
Original line number Diff line number Diff line 
/* 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 */

arch/sh/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -167,6 +167,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>

arch/sh/kernel/idle.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/sh/kernel/setup.c

+55 −0
Original line number Diff line number Diff line
@@ -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>
@@ -357,3 +358,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';

}