From: "tip-bot2 for Thomas Gleixner" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/boot] mips/cpu: Switch to arch_cpu_finalize_init()
Date: Fri, 16 Jun 2023 09:24:47 -0000 [thread overview]
Message-ID: <168690748776.404.1793381056612048285.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230613224545.312438573@linutronix.de>
The following commit has been merged into the x86/boot branch of tip:
Commit-ID: 7f066a22fe353a827a402ee2835e81f045b1574d
Gitweb: https://git.kernel.org/tip/7f066a22fe353a827a402ee2835e81f045b1574d
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Wed, 14 Jun 2023 01:39:32 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Fri, 16 Jun 2023 10:16:00 +02:00
mips/cpu: Switch to arch_cpu_finalize_init()
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
---
arch/mips/Kconfig | 1 +
arch/mips/include/asm/bugs.h | 17 -----------------
arch/mips/kernel/setup.c | 13 +++++++++++++
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c2f5498..023d3bd 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -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
diff --git a/arch/mips/include/asm/bugs.h b/arch/mips/include/asm/bugs.h
index 653f78f..84be74a 100644
--- a/arch/mips/include/asm/bugs.h
+++ b/arch/mips/include/asm/bugs.h
@@ -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>
@@ -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))
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index febdc55..07a1518 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -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>
@@ -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();
+}
next prev parent reply other threads:[~2023-06-16 9:25 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 23:39 [patch 00/17] init, treewide, x86: Cleanup check_bugs() and start sanitizing the x86 boot process Thomas Gleixner
2023-06-13 23:39 ` [patch 01/17] init: Provide arch_cpu_finalize_init() Thomas Gleixner
2023-06-14 9:28 ` Borislav Petkov
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-13 23:39 ` [patch 02/17] x86/cpu: Switch to arch_cpu_finalize_init() Thomas Gleixner
2023-06-14 9:53 ` Thomas Gleixner
2023-06-14 10:39 ` Borislav Petkov
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-13 23:39 ` [patch 03/17] ARM: cpu: " Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-25 21:27 ` [patch 03/17] " Philippe Mathieu-Daudé
2023-06-13 23:39 ` [patch 04/17] ia64/cpu: " Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-25 21:24 ` [patch 04/17] " Philippe Mathieu-Daudé
2023-06-13 23:39 ` [patch 05/17] loongarch/cpu: " Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-25 21:24 ` [patch 05/17] " Philippe Mathieu-Daudé
2023-06-13 23:39 ` [patch 06/17] m68k/cpu: " Thomas Gleixner
2023-06-14 9:22 ` Geert Uytterhoeven
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-13 23:39 ` [patch 07/17] mips/cpu: " Thomas Gleixner
2023-06-16 9:24 ` tip-bot2 for Thomas Gleixner [this message]
2023-06-25 21:25 ` Philippe Mathieu-Daudé
2023-06-13 23:39 ` [patch 08/17] sh/cpu: " Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-25 21:29 ` [patch 08/17] " Philippe Mathieu-Daudé
2023-06-25 21:45 ` John Paul Adrian Glaubitz
2023-06-13 23:39 ` [patch 09/17] sparc/cpu: " Thomas Gleixner
2023-06-14 20:41 ` Sam Ravnborg
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-25 21:30 ` [patch 09/17] " Philippe Mathieu-Daudé
2023-06-13 23:39 ` [patch 10/17] um/cpu: " Thomas Gleixner
2023-06-14 6:51 ` Richard Weinberger
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-25 21:28 ` [patch 10/17] " Philippe Mathieu-Daudé
2023-06-13 23:39 ` [patch 11/17] init: Remove check_bugs() leftovers Thomas Gleixner
2023-06-14 6:14 ` Richard Henderson
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-25 21:31 ` [patch 11/17] " Philippe Mathieu-Daudé
2023-06-13 23:39 ` [patch 12/17] init: Invoke arch_cpu_finalize_init() earlier Thomas Gleixner
2023-06-15 21:44 ` Edgecombe, Rick P
2023-06-15 22:03 ` Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-13 23:39 ` [patch 13/17] init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init() Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-21 17:12 ` [patch 13/17] " Tom Lendacky
2023-06-13 23:39 ` [patch 14/17] x86/init: Initialize signal frame size late Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-13 23:39 ` [patch 15/17] x86/fpu: Remove cpuinfo argument from init functions Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-13 23:39 ` [patch 16/17] x86/fpu: Mark init functions __init Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-06-13 23:39 ` [patch 17/17] x86/fpu: Move FPU initialization into arch_cpu_finalize_init() Thomas Gleixner
2023-06-14 5:03 ` Chang S. Bae
2023-06-14 9:52 ` Thomas Gleixner
2023-06-16 9:24 ` [tip: x86/boot] " tip-bot2 for Thomas Gleixner
2023-09-01 17:30 ` [patch 17/17] " Guenter Roeck
2023-09-01 18:00 ` Nikolay Borisov
2023-09-01 18:21 ` Guenter Roeck
2023-09-01 18:02 ` Nikolay Borisov
2023-09-01 21:09 ` Guenter Roeck
2023-06-28 3:38 ` [patch 00/17] init, treewide, x86: Cleanup check_bugs() and start sanitizing the x86 boot process Jan Engelhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=168690748776.404.1793381056612048285.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).