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

Commit 5cef8c2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 boot updates from Ingo Molnar:

 - Centaur CPU updates (David Wang)

 - AMD and other CPU topology enumeration improvements and fixes
   (Borislav Petkov, Thomas Gleixner, Suravee Suthikulpanit)

 - Continued 5-level paging work (Kirill A. Shutemov)

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Mark __pgtable_l5_enabled __initdata
  x86/mm: Mark p4d_offset() __always_inline
  x86/mm: Introduce the 'no5lvl' kernel parameter
  x86/mm: Stop pretending pgtable_l5_enabled is a variable
  x86/mm: Unify pgtable_l5_enabled usage in early boot code
  x86/boot/compressed/64: Fix trampoline page table address calculation
  x86/CPU: Move x86_cpuinfo::x86_max_cores assignment to detect_num_cpu_cores()
  x86/Centaur: Report correct CPU/cache topology
  x86/CPU: Move cpu_detect_cache_sizes() into init_intel_cacheinfo()
  x86/CPU: Make intel_num_cpu_cores() generic
  x86/CPU: Move cpu local function declarations to local header
  x86/CPU/AMD: Derive CPU topology from CPUID function 0xB when available
  x86/CPU: Modify detect_extended_topology() to return result
  x86/CPU/AMD: Calculate last level cache ID from number of sharing threads
  x86/CPU: Rename intel_cacheinfo.c to cacheinfo.c
  perf/events/amd/uncore: Fix amd_uncore_llc ID to use pre-defined cpu_llc_id
  x86/CPU/AMD: Have smp_num_siblings and cpu_llc_id always be present
  x86/Centaur: Initialize supported CPU features properly
parents f7f4e7fc e4e961e3

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -2608,6 +2608,9 @@ 
			emulation library even if a 387 maths coprocessor

			is present.



	no5lvl		[X86-64] Disable 5-level paging mode. Forces

			kernel to use 4-level paging instead.



	no_console_suspend

			[HW] Never suspend the console

			Disable suspending of consoles during suspend and

arch/x86/boot/compressed/cmdline.c

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

#include "misc.h"



#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE

#if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE || CONFIG_X86_5LEVEL



static unsigned long fs;

static inline void set_fs(unsigned long seg)

arch/x86/boot/compressed/head_64.S

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ ENTRY(startup_64) 
	 * this function call.

	 */

	pushq	%rsi

	movq	%rsi, %rdi		/* real mode address */

	call	paging_prepare

	popq	%rsi

arch/x86/boot/compressed/kaslr.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#include <linux/decompress/mm.h>



#ifdef CONFIG_X86_5LEVEL

unsigned int pgtable_l5_enabled __ro_after_init;

unsigned int __pgtable_l5_enabled;

unsigned int pgdir_shift __ro_after_init = 39;

unsigned int ptrs_per_p4d __ro_after_init = 1;

#endif
@@ -734,7 +734,7 @@ void choose_random_location(unsigned long input, 


#ifdef CONFIG_X86_5LEVEL

	if (__read_cr4() & X86_CR4_LA57) {

		pgtable_l5_enabled = 1;

		__pgtable_l5_enabled = 1;

		pgdir_shift = 48;

		ptrs_per_p4d = 512;

	}

arch/x86/boot/compressed/misc.h

+2 −4
Original line number Diff line number Diff line
@@ -12,10 +12,8 @@ 
#undef CONFIG_PARAVIRT_SPINLOCKS

#undef CONFIG_KASAN



#ifdef CONFIG_X86_5LEVEL

/* cpu_feature_enabled() cannot be used that early */

#define pgtable_l5_enabled __pgtable_l5_enabled

#endif

/* cpu_feature_enabled() cannot be used this early */

#define USE_EARLY_PGTABLE_L5



#include <linux/linkage.h>

#include <linux/screen_info.h>