Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18cd611a authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

mips/cpu: Switch to arch_cpu_finalize_init() 



commit 7f066a22fe353a827a402ee2835e81f045b1574d 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.312438573@linutronix.de


Signed-off-by: default avatarDaniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2febb4a7

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config MIPS 
	select ARCH_32BIT_OFF_T if !64BIT

	select ARCH_BINFMT_ELF_STATE if MIPS_FP_SUPPORT

	select ARCH_CLOCKSOURCE_DATA

	select ARCH_HAS_CPU_FINALIZE_INIT

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_SUPPORTS_UPROBES

arch/mips/include/asm/bugs.h

+0 −17
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * This is included by init/main.c to check for architecture-dependent bugs.

 *

 * Copyright (C) 2007  Maciej W. Rozycki

 *

 * Needs:

 *	void check_bugs(void);

 */

#ifndef _ASM_BUGS_H

#define _ASM_BUGS_H



#include <linux/bug.h>

#include <linux/delay.h>

#include <linux/smp.h>



#include <asm/cpu.h>
@@ -31,17 +25,6 @@ static inline void check_bugs_early(void) 
#endif

}



static inline void check_bugs(void)

{

	unsigned int cpu = smp_processor_id();



	cpu_data[cpu].udelay_val = loops_per_jiffy;

	check_bugs32();

#ifdef CONFIG_64BIT

	check_bugs64();

#endif

}



static inline int r4k_daddiu_bug(void)

{

#ifdef CONFIG_64BIT

arch/mips/kernel/setup.c

+13 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * Copyright (C) 2000, 2001, 2002, 2007	 Maciej W. Rozycki

 */

#include <linux/init.h>

#include <linux/cpu.h>

#include <linux/delay.h>

#include <linux/ioport.h>

#include <linux/export.h>

#include <linux/screen_info.h>
@@ -812,3 +814,14 @@ static int __init setnocoherentio(char *str) 
}

early_param("nocoherentio", setnocoherentio);

#endif



void __init arch_cpu_finalize_init(void)

{

	unsigned int cpu = smp_processor_id();



	cpu_data[cpu].udelay_val = loops_per_jiffy;

	check_bugs32();



	if (IS_ENABLED(CONFIG_CPU_R4X00_BUGS64))

		check_bugs64();

}