Skip to content

Commit

Permalink
mips/cpu: Switch to arch_cpu_finalize_init()
Browse files Browse the repository at this point in the history
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.312438573@linutronix.de
  • Loading branch information
Thomas Gleixner committed Jun 16, 2023
1 parent 9ceecc2 commit 7f066a2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
1 change: 1 addition & 0 deletions arch/mips/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ config MIPS
default y
select ARCH_32BIT_OFF_T if !64BIT
select ARCH_BINFMT_ELF_STATE if MIPS_FP_SUPPORT
select ARCH_HAS_CPU_FINALIZE_INIT
select ARCH_HAS_CURRENT_STACK_POINTER if !CC_IS_CLANG || CLANG_VERSION >= 140000
select ARCH_HAS_DEBUG_VIRTUAL if !64BIT
select ARCH_HAS_FORTIFY_SOURCE
Expand Down
17 changes: 0 additions & 17 deletions arch/mips/include/asm/bugs.h
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
/* 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>
Expand All @@ -24,17 +18,6 @@ extern void check_bugs64_early(void);
extern void check_bugs32(void);
extern void check_bugs64(void);

static inline void __init check_bugs(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();
}

static inline int r4k_daddiu_bug(void)
{
if (!IS_ENABLED(CONFIG_CPU_R4X00_BUGS64))
Expand Down
13 changes: 13 additions & 0 deletions arch/mips/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -840,3 +842,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();
}

0 comments on commit 7f066a2

Please sign in to comment.