Commit 7cffdbe3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-boot-2023-06-26' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 boot updates from Thomas Gleixner:
 "Initialize FPU late.

  Right now FPU is initialized very early during boot. There is no real
  requirement to do so. The only requirement is to have it done before
  alternatives are patched.

  That's done in check_bugs() which does way more than what the function
  name suggests.

  So first rename check_bugs() to arch_cpu_finalize_init() which makes
  it clear what this is about.

  Move the invocation of arch_cpu_finalize_init() earlier in
  start_kernel() as it has to be done before fork_init() which needs to
  know the FPU register buffer size.

  With those prerequisites the FPU initialization can be moved into
  arch_cpu_finalize_init(), which removes it from the early and fragile
  part of the x86 bringup"

* tag 'x86-boot-2023-06-26' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mem_encrypt: Unbreak the AMD_MEM_ENCRYPT=n build
  x86/fpu: Move FPU initialization into arch_cpu_finalize_init()
  x86/fpu: Mark init functions __init
  x86/fpu: Remove cpuinfo argument from init functions
  x86/init: Initialize signal frame size late
  init, x86: Move mem_encrypt_init() into arch_cpu_finalize_init()
  init: Invoke arch_cpu_finalize_init() earlier
  init: Remove check_bugs() leftovers
  um/cpu: Switch to arch_cpu_finalize_init()
  sparc/cpu: Switch to arch_cpu_finalize_init()
  sh/cpu: Switch to arch_cpu_finalize_init()
  mips/cpu: Switch to arch_cpu_finalize_init()
  m68k/cpu: Switch to arch_cpu_finalize_init()
  loongarch/cpu: Switch to arch_cpu_finalize_init()
  ia64/cpu: Switch to arch_cpu_finalize_init()
  ARM: cpu: Switch to arch_cpu_finalize_init()
  x86/cpu: Switch to arch_cpu_finalize_init()
  init: Provide arch_cpu_finalize_init()
parents 00173879 0a9567ac

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -285,6 +285,9 @@ config ARCH_HAS_DMA_SET_UNCACHED 
config ARCH_HAS_DMA_CLEAR_UNCACHED

	bool



config ARCH_HAS_CPU_FINALIZE_INIT

	bool



# Select if arch init_task must go in the __init_task_data section

config ARCH_TASK_STRUCT_ON_STACK

	bool

arch/alpha/include/asm/bugs.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 *  include/asm-alpha/bugs.h

 *

 *  Copyright (C) 1994  Linus Torvalds

 */



/*

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

 *

 * Needs:

 *	void check_bugs(void);

 */



/*

 * I don't know of any alpha bugs yet.. Nice chip

 */



static void check_bugs(void)

{

}

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config ARM 
	select ARCH_32BIT_OFF_T

	select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND

	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_CPU_FINALIZE_INIT if MMU

	select ARCH_HAS_CURRENT_STACK_POINTER

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE

arch/arm/include/asm/bugs.h

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

/*

 *  arch/arm/include/asm/bugs.h

 *

 *  Copyright (C) 1995-2003 Russell King

 */

#ifndef __ASM_BUGS_H
@@ -10,10 +8,8 @@ 
extern void check_writebuffer_bugs(void);



#ifdef CONFIG_MMU

extern void check_bugs(void);

extern void check_other_bugs(void);

#else

#define check_bugs() do { } while (0)

#define check_other_bugs() do { } while (0)

#endif

arch/arm/kernel/bugs.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/init.h>

#include <linux/cpu.h>

#include <asm/bugs.h>

#include <asm/proc-fns.h>
@@ -11,7 +12,7 @@ void check_other_bugs(void) 
#endif

}



void __init check_bugs(void)

void __init arch_cpu_finalize_init(void)

{

	check_writebuffer_bugs();

	check_other_bugs();